From 201110b4f45d4e992724d2cad885819536010819 Mon Sep 17 00:00:00 2001 From: Darshak Sheladiya Date: Thu, 21 Nov 2024 11:14:15 +0100 Subject: [PATCH] fix: TIP is disabled --- core/cva6.sv | 2 +- corev_apu/fpga/src/ariane_xilinx.sv | 3122 ++++++++++++++------------- corev_apu/src/ariane.sv | 134 +- corev_apu/tb/ariane_testharness.sv | 1116 +++++----- 4 files changed, 2236 insertions(+), 2138 deletions(-) diff --git a/core/cva6.sv b/core/cva6.sv index f23c5174f75..b1a515b2a68 100644 --- a/core/cva6.sv +++ b/core/cva6.sv @@ -32,7 +32,7 @@ module cva6 //TIP - parameter bit IsTIP = bit'(1), + parameter bit IsTIP = bit'(0), parameter type tip_instr_t = struct packed { logic [config_pkg::NRET-1:0] iretire; diff --git a/corev_apu/fpga/src/ariane_xilinx.sv b/corev_apu/fpga/src/ariane_xilinx.sv index be717d06359..ae1b118b2e3 100644 --- a/corev_apu/fpga/src/ariane_xilinx.sv +++ b/corev_apu/fpga/src/ariane_xilinx.sv @@ -12,457 +12,499 @@ // Author: Florian Zaruba module ariane_xilinx ( -// WARNING: Do not define input parameters. This causes the FPGA build to fail. + // WARNING: Do not define input parameters. This causes the FPGA build to fail. `ifdef GENESYSII - input logic sys_clk_p , - input logic sys_clk_n , - input logic cpu_resetn , - inout wire [31:0] ddr3_dq , - inout wire [ 3:0] ddr3_dqs_n , - inout wire [ 3:0] ddr3_dqs_p , - output logic [14:0] ddr3_addr , - output logic [ 2:0] ddr3_ba , - output logic ddr3_ras_n , - output logic ddr3_cas_n , - output logic ddr3_we_n , - output logic ddr3_reset_n, - output logic [ 0:0] ddr3_ck_p , - output logic [ 0:0] ddr3_ck_n , - output logic [ 0:0] ddr3_cke , - output logic [ 0:0] ddr3_cs_n , - output logic [ 3:0] ddr3_dm , - output logic [ 0:0] ddr3_odt , - - output wire eth_rst_n , - input wire eth_rxck , - input wire eth_rxctl , - input wire [3:0] eth_rxd , - output wire eth_txck , - output wire eth_txctl , - output wire [3:0] eth_txd , - inout wire eth_mdio , - output logic eth_mdc , - output logic [ 7:0] led , - input logic [ 7:0] sw , - output logic fan_pwm , - input logic trst_n , + input logic sys_clk_p, + input logic sys_clk_n, + input logic cpu_resetn, + inout wire [31:0] ddr3_dq, + inout wire [ 3:0] ddr3_dqs_n, + inout wire [ 3:0] ddr3_dqs_p, + output logic [14:0] ddr3_addr, + output logic [ 2:0] ddr3_ba, + output logic ddr3_ras_n, + output logic ddr3_cas_n, + output logic ddr3_we_n, + output logic ddr3_reset_n, + output logic [ 0:0] ddr3_ck_p, + output logic [ 0:0] ddr3_ck_n, + output logic [ 0:0] ddr3_cke, + output logic [ 0:0] ddr3_cs_n, + output logic [ 3:0] ddr3_dm, + output logic [ 0:0] ddr3_odt, + + output wire eth_rst_n, + input wire eth_rxck, + input wire eth_rxctl, + input wire [3:0] eth_rxd, + output wire eth_txck, + output wire eth_txctl, + output wire [3:0] eth_txd, + inout wire eth_mdio, + output logic eth_mdc, + output logic [7:0] led, + input logic [7:0] sw, + output logic fan_pwm, + input logic trst_n, `elsif KC705 - input logic sys_clk_p , - input logic sys_clk_n , - - input logic cpu_reset , - inout logic [63:0] ddr3_dq , - inout logic [ 7:0] ddr3_dqs_n , - inout logic [ 7:0] ddr3_dqs_p , - output logic [13:0] ddr3_addr , - output logic [ 2:0] ddr3_ba , - output logic ddr3_ras_n , - output logic ddr3_cas_n , - output logic ddr3_we_n , - output logic ddr3_reset_n, - output logic [ 0:0] ddr3_ck_p , - output logic [ 0:0] ddr3_ck_n , - output logic [ 0:0] ddr3_cke , - output logic [ 0:0] ddr3_cs_n , - output logic [ 7:0] ddr3_dm , - output logic [ 0:0] ddr3_odt , - - output wire eth_rst_n , - input wire eth_rxck , - input wire eth_rxctl , - input wire [3:0] eth_rxd , - output wire eth_txck , - output wire eth_txctl , - output wire [3:0] eth_txd , - inout wire eth_mdio , - output logic eth_mdc , - output logic [ 3:0] led , - input logic [ 3:0] sw , - output logic fan_pwm , - input logic trst_n , + input logic sys_clk_p, + input logic sys_clk_n, + + input logic cpu_reset, + inout logic [63:0] ddr3_dq, + inout logic [ 7:0] ddr3_dqs_n, + inout logic [ 7:0] ddr3_dqs_p, + output logic [13:0] ddr3_addr, + output logic [ 2:0] ddr3_ba, + output logic ddr3_ras_n, + output logic ddr3_cas_n, + output logic ddr3_we_n, + output logic ddr3_reset_n, + output logic [ 0:0] ddr3_ck_p, + output logic [ 0:0] ddr3_ck_n, + output logic [ 0:0] ddr3_cke, + output logic [ 0:0] ddr3_cs_n, + output logic [ 7:0] ddr3_dm, + output logic [ 0:0] ddr3_odt, + + output wire eth_rst_n, + input wire eth_rxck, + input wire eth_rxctl, + input wire [ 3:0] eth_rxd, + output wire eth_txck, + output wire eth_txctl, + output wire [ 3:0] eth_txd, + inout wire eth_mdio, + output logic eth_mdc, + output logic [ 3:0] led, + input logic [ 3:0] sw, + output logic fan_pwm, + input logic trst_n, `elsif VC707 - input logic sys_clk_p , - input logic sys_clk_n , - input logic cpu_reset , - inout wire [63:0] ddr3_dq , - inout wire [ 7:0] ddr3_dqs_n , - inout wire [ 7:0] ddr3_dqs_p , - output logic [13:0] ddr3_addr , - output logic [ 2:0] ddr3_ba , - output logic ddr3_ras_n , - output logic ddr3_cas_n , - output logic ddr3_we_n , - output logic ddr3_reset_n, - output logic [ 0:0] ddr3_ck_p , - output logic [ 0:0] ddr3_ck_n , - output logic [ 0:0] ddr3_cke , - output logic [ 0:0] ddr3_cs_n , - output logic [ 7:0] ddr3_dm , - output logic [ 0:0] ddr3_odt , - output wire eth_rst_n , - input wire eth_rxck , - input wire eth_rxctl , - input wire [3:0] eth_rxd , - output wire eth_txck , - output wire eth_txctl , - output wire [3:0] eth_txd , - inout wire eth_mdio , - output logic eth_mdc , - output logic [ 7:0] led , - input logic [ 7:0] sw , - output logic fan_pwm , - input logic trst , + input logic sys_clk_p, + input logic sys_clk_n, + input logic cpu_reset, + inout wire [63:0] ddr3_dq, + inout wire [ 7:0] ddr3_dqs_n, + inout wire [ 7:0] ddr3_dqs_p, + output logic [13:0] ddr3_addr, + output logic [ 2:0] ddr3_ba, + output logic ddr3_ras_n, + output logic ddr3_cas_n, + output logic ddr3_we_n, + output logic ddr3_reset_n, + output logic [ 0:0] ddr3_ck_p, + output logic [ 0:0] ddr3_ck_n, + output logic [ 0:0] ddr3_cke, + output logic [ 0:0] ddr3_cs_n, + output logic [ 7:0] ddr3_dm, + output logic [ 0:0] ddr3_odt, + output wire eth_rst_n, + input wire eth_rxck, + input wire eth_rxctl, + input wire [ 3:0] eth_rxd, + output wire eth_txck, + output wire eth_txctl, + output wire [ 3:0] eth_txd, + inout wire eth_mdio, + output logic eth_mdc, + output logic [ 7:0] led, + input logic [ 7:0] sw, + output logic fan_pwm, + input logic trst, `elsif VCU118 - input wire c0_sys_clk_p , // 250 MHz Clock for DDR - input wire c0_sys_clk_n , // 250 MHz Clock for DDR - input wire sys_clk_p , // 100 MHz Clock for PCIe - input wire sys_clk_n , // 100 MHz Clock for PCIE - input wire sys_rst_n , // PCIe Reset - input logic cpu_reset , // CPU subsystem reset - output wire [16:0] c0_ddr4_adr , - output wire [1:0] c0_ddr4_ba , - output wire [0:0] c0_ddr4_cke , - output wire [0:0] c0_ddr4_cs_n , - inout wire [7:0] c0_ddr4_dm_dbi_n, - inout wire [63:0] c0_ddr4_dq , - inout wire [7:0] c0_ddr4_dqs_c , - inout wire [7:0] c0_ddr4_dqs_t , - output wire [0:0] c0_ddr4_odt , - output wire [0:0] c0_ddr4_bg , - output wire c0_ddr4_reset_n , - output wire c0_ddr4_act_n , - output wire [0:0] c0_ddr4_ck_c , - output wire [0:0] c0_ddr4_ck_t , - output wire [7:0] pci_exp_txp , - output wire [7:0] pci_exp_txn , - input wire [7:0] pci_exp_rxp , - input wire [7:0] pci_exp_rxn , - input logic trst_n , + input wire c0_sys_clk_p, // 250 MHz Clock for DDR + input wire c0_sys_clk_n, // 250 MHz Clock for DDR + input wire sys_clk_p, // 100 MHz Clock for PCIe + input wire sys_clk_n, // 100 MHz Clock for PCIE + input wire sys_rst_n, // PCIe Reset + input logic cpu_reset, // CPU subsystem reset + output wire [16:0] c0_ddr4_adr, + output wire [ 1:0] c0_ddr4_ba, + output wire [ 0:0] c0_ddr4_cke, + output wire [ 0:0] c0_ddr4_cs_n, + inout wire [ 7:0] c0_ddr4_dm_dbi_n, + inout wire [63:0] c0_ddr4_dq, + inout wire [ 7:0] c0_ddr4_dqs_c, + inout wire [ 7:0] c0_ddr4_dqs_t, + output wire [ 0:0] c0_ddr4_odt, + output wire [ 0:0] c0_ddr4_bg, + output wire c0_ddr4_reset_n, + output wire c0_ddr4_act_n, + output wire [ 0:0] c0_ddr4_ck_c, + output wire [ 0:0] c0_ddr4_ck_t, + output wire [ 7:0] pci_exp_txp, + output wire [ 7:0] pci_exp_txn, + input wire [ 7:0] pci_exp_rxp, + input wire [ 7:0] pci_exp_rxn, + input logic trst_n, `elsif NEXYS_VIDEO - input logic sys_clk_i , - input logic cpu_resetn , - - inout wire [15:0] ddr3_dq , - inout wire [ 1:0] ddr3_dqs_n , - inout wire [ 1:0] ddr3_dqs_p , - output wire [14:0] ddr3_addr , - output wire [ 2:0] ddr3_ba , - output wire ddr3_ras_n , - output wire ddr3_cas_n , - output wire ddr3_we_n , - output wire ddr3_reset_n, - output wire [ 0:0] ddr3_ck_p , - output wire [ 0:0] ddr3_ck_n , - output wire [ 0:0] ddr3_cke , - output wire [ 1:0] ddr3_dm , - output wire [ 0:0] ddr3_odt , - - output wire eth_rst_n , - input wire eth_rxck , - input wire eth_rxctl , - input wire [3:0] eth_rxd , - output wire eth_txck , - output wire eth_txctl , - output wire [3:0] eth_txd , - inout wire eth_mdio , - output logic eth_mdc , - output logic [ 7:0] led , - input logic [ 7:0] sw , - output logic fan_pwm , - input logic trst_n , + input logic sys_clk_i, + input logic cpu_resetn, + + inout wire [15:0] ddr3_dq, + inout wire [ 1:0] ddr3_dqs_n, + inout wire [ 1:0] ddr3_dqs_p, + output wire [14:0] ddr3_addr, + output wire [ 2:0] ddr3_ba, + output wire ddr3_ras_n, + output wire ddr3_cas_n, + output wire ddr3_we_n, + output wire ddr3_reset_n, + output wire [ 0:0] ddr3_ck_p, + output wire [ 0:0] ddr3_ck_n, + output wire [ 0:0] ddr3_cke, + output wire [ 1:0] ddr3_dm, + output wire [ 0:0] ddr3_odt, + + output wire eth_rst_n, + input wire eth_rxck, + input wire eth_rxctl, + input wire [3:0] eth_rxd, + output wire eth_txck, + output wire eth_txctl, + output wire [3:0] eth_txd, + inout wire eth_mdio, + output logic eth_mdc, + output logic [7:0] led, + input logic [7:0] sw, + output logic fan_pwm, + input logic trst_n, `endif - // SPI - output logic spi_mosi , - input logic spi_miso , - output logic spi_ss , - output logic spi_clk_o , - // common part - // input logic trst_n , - input logic tck , - input logic tms , - input logic tdi , - output wire tdo , - input logic rx , - output logic tx + // SPI + output logic spi_mosi, + input logic spi_miso, + output logic spi_ss, + output logic spi_clk_o, + // common part + // input logic trst_n , + input logic tck, + input logic tms, + input logic tdi, + output wire tdo, + input logic rx, + output logic tx ); -// CVA6 Xilinx configuration -function automatic config_pkg::cva6_cfg_t build_fpga_config(config_pkg::cva6_user_cfg_t CVA6UserCfg); - config_pkg::cva6_user_cfg_t cfg = CVA6UserCfg; - cfg.RVZiCond = bit'(0); - cfg.NrNonIdempotentRules = unsigned'(1); - cfg.NonIdempotentAddrBase = 1024'({64'b0}); - cfg.NonIdempotentLength = 1024'({ariane_soc::DRAMBase}); - return build_config_pkg::build_config(cfg); -endfunction - -// CVA6 Xilinx configuration -localparam config_pkg::cva6_cfg_t CVA6Cfg = build_fpga_config(cva6_config_pkg::cva6_cfg); - -localparam type rvfi_probes_instr_t = `RVFI_PROBES_INSTR_T(CVA6Cfg); -localparam type rvfi_probes_csr_t = `RVFI_PROBES_CSR_T(CVA6Cfg); -localparam type rvfi_probes_t = struct packed { - logic csr; - logic instr; -}; - -// 24 MByte in 8 byte words -localparam NumWords = (24 * 1024 * 1024) / 8; - -// WARNING: If NBSlave is modified, Xilinx's IPs under fpga/xilinx need to be updated with the new AXI id width and regenerated. -// Otherwise reads and writes to DRAM may be returned to the wrong master and the crossbar will freeze. See issue #568. -localparam NBSlave = 2; // debug, ariane -localparam AxiAddrWidth = 64; -localparam AxiDataWidth = 64; -localparam AxiIdWidthMaster = 4; -localparam AxiIdWidthSlaves = AxiIdWidthMaster + $clog2(NBSlave); // 5 -localparam AxiUserWidth = CVA6Cfg.AxiUserWidth; - -`AXI_TYPEDEF_ALL(axi_slave, - logic [ AxiAddrWidth-1:0], - logic [AxiIdWidthSlaves-1:0], - logic [ AxiDataWidth-1:0], - logic [(AxiDataWidth/8)-1:0], - logic [ AxiUserWidth-1:0]) - -AXI_BUS #( - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_ID_WIDTH ( AxiIdWidthMaster ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) slave[NBSlave-1:0](); - -AXI_BUS #( - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) master[ariane_soc::NB_PERIPHERALS-1:0](); - -AXI_BUS #( - .AXI_ADDR_WIDTH ( CVA6Cfg.XLEN ), - .AXI_DATA_WIDTH ( CVA6Cfg.XLEN ), - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) master_to_dm[0:0](); - -// disable test-enable -logic test_en; -logic ndmreset; -logic ndmreset_n; -logic debug_req_irq; -logic timer_irq; -logic ipi; - -logic clk; -logic eth_clk; -logic spi_clk_i; -logic phy_tx_clk; -logic sd_clk_sys; - -logic ddr_sync_reset; -logic ddr_clock_out; - -logic rst_n, rst; -logic rtc; - -// we need to switch reset polarity + + // CVA6 TIP config + localparam bit IsTIP = bit'(0); + + // CVA6 Xilinx configuration + function automatic config_pkg::cva6_cfg_t build_fpga_config( + config_pkg::cva6_user_cfg_t CVA6UserCfg); + config_pkg::cva6_user_cfg_t cfg = CVA6UserCfg; + cfg.RVZiCond = bit'(0); + cfg.NrNonIdempotentRules = unsigned'(1); + cfg.NonIdempotentAddrBase = 1024'({64'b0}); + cfg.NonIdempotentLength = 1024'({ariane_soc::DRAMBase}); + return build_config_pkg::build_config(cfg); + endfunction + + // CVA6 Xilinx configuration + localparam config_pkg::cva6_cfg_t CVA6Cfg = build_fpga_config(cva6_config_pkg::cva6_cfg); + + localparam type rvfi_probes_instr_t = `RVFI_PROBES_INSTR_T(CVA6Cfg); + localparam type rvfi_probes_csr_t = `RVFI_PROBES_CSR_T(CVA6Cfg); + localparam type rvfi_probes_t = struct packed { + logic csr; + logic instr; + }; + + // 24 MByte in 8 byte words + localparam NumWords = (24 * 1024 * 1024) / 8; + + // WARNING: If NBSlave is modified, Xilinx's IPs under fpga/xilinx need to be updated with the new AXI id width and regenerated. + // Otherwise reads and writes to DRAM may be returned to the wrong master and the crossbar will freeze. See issue #568. + localparam NBSlave = 2; // debug, ariane + localparam AxiAddrWidth = 64; + localparam AxiDataWidth = 64; + localparam AxiIdWidthMaster = 4; + localparam AxiIdWidthSlaves = AxiIdWidthMaster + $clog2(NBSlave); // 5 + localparam AxiUserWidth = CVA6Cfg.AxiUserWidth; + + `AXI_TYPEDEF_ALL(axi_slave, logic [ AxiAddrWidth-1:0], logic [AxiIdWidthSlaves-1:0], + logic [ AxiDataWidth-1:0], logic [(AxiDataWidth/8)-1:0], + logic [ AxiUserWidth-1:0]) + + AXI_BUS #( + .AXI_ADDR_WIDTH(AxiAddrWidth), + .AXI_DATA_WIDTH(AxiDataWidth), + .AXI_ID_WIDTH (AxiIdWidthMaster), + .AXI_USER_WIDTH(AxiUserWidth) + ) slave[NBSlave-1:0] (); + + AXI_BUS #( + .AXI_ADDR_WIDTH(AxiAddrWidth), + .AXI_DATA_WIDTH(AxiDataWidth), + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_USER_WIDTH(AxiUserWidth) + ) master[ariane_soc::NB_PERIPHERALS-1:0] (); + + AXI_BUS #( + .AXI_ADDR_WIDTH(CVA6Cfg.XLEN), + .AXI_DATA_WIDTH(CVA6Cfg.XLEN), + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_USER_WIDTH(AxiUserWidth) + ) master_to_dm[0:0] (); + + // disable test-enable + logic test_en; + logic ndmreset; + logic ndmreset_n; + logic debug_req_irq; + logic timer_irq; + logic ipi; + + logic clk; + logic eth_clk; + logic spi_clk_i; + logic phy_tx_clk; + logic sd_clk_sys; + + logic ddr_sync_reset; + logic ddr_clock_out; + + logic rst_n, rst; + logic rtc; + + // we need to switch reset polarity `ifdef VCU118 -logic cpu_resetn; -assign cpu_resetn = ~cpu_reset; + logic cpu_resetn; + assign cpu_resetn = ~cpu_reset; `elsif GENESYSII -logic cpu_reset; -assign cpu_reset = ~cpu_resetn; + logic cpu_reset; + assign cpu_reset = ~cpu_resetn; `elsif KC705 -assign cpu_resetn = ~cpu_reset; + assign cpu_resetn = ~cpu_reset; `elsif VC707 -assign cpu_resetn = ~cpu_reset; -assign trst_n = ~trst; + assign cpu_resetn = ~cpu_reset; + assign trst_n = ~trst; `elsif NEXYS_VIDEO -logic cpu_reset; -assign cpu_reset = ~cpu_resetn; + logic cpu_reset; + assign cpu_reset = ~cpu_resetn; `endif -logic pll_locked; + logic pll_locked; -// ROM -logic rom_req; -logic [AxiAddrWidth-1:0] rom_addr; -logic [AxiDataWidth-1:0] rom_rdata; + // ROM + logic rom_req; + logic [AxiAddrWidth-1:0] rom_addr; + logic [AxiDataWidth-1:0] rom_rdata; -// Debug -logic debug_req_valid; -logic debug_req_ready; -dm::dmi_req_t debug_req; -logic debug_resp_valid; -logic debug_resp_ready; -dm::dmi_resp_t debug_resp; + // Debug + logic debug_req_valid; + logic debug_req_ready; + dm::dmi_req_t debug_req; + logic debug_resp_valid; + logic debug_resp_ready; + dm::dmi_resp_t debug_resp; -logic dmactive; + logic dmactive; -// IRQ -logic [1:0] irq; -assign test_en = 1'b0; + // IRQ + logic [ 1:0] irq; + assign test_en = 1'b0; -logic [NBSlave-1:0] pc_asserted; + logic [NBSlave-1:0] pc_asserted; -rstgen i_rstgen_main ( - .clk_i ( clk ), - .rst_ni ( pll_locked & (~ndmreset) ), - .test_mode_i ( test_en ), - .rst_no ( ndmreset_n ), - .init_no ( ) // keep open -); + rstgen i_rstgen_main ( + .clk_i (clk), + .rst_ni (pll_locked & (~ndmreset)), + .test_mode_i(test_en), + .rst_no (ndmreset_n), + .init_no () // keep open + ); -assign rst_n = ~ddr_sync_reset; -assign rst = ddr_sync_reset; - -// --------------- -// AXI Xbar -// --------------- - -axi_pkg::xbar_rule_64_t [ariane_soc::NB_PERIPHERALS-1:0] addr_map; - -assign addr_map = '{ - '{ idx: ariane_soc::Debug, start_addr: ariane_soc::DebugBase, end_addr: ariane_soc::DebugBase + ariane_soc::DebugLength }, - '{ idx: ariane_soc::ROM, start_addr: ariane_soc::ROMBase, end_addr: ariane_soc::ROMBase + ariane_soc::ROMLength }, - '{ idx: ariane_soc::CLINT, start_addr: ariane_soc::CLINTBase, end_addr: ariane_soc::CLINTBase + ariane_soc::CLINTLength }, - '{ idx: ariane_soc::PLIC, start_addr: ariane_soc::PLICBase, end_addr: ariane_soc::PLICBase + ariane_soc::PLICLength }, - '{ idx: ariane_soc::UART, start_addr: ariane_soc::UARTBase, end_addr: ariane_soc::UARTBase + ariane_soc::UARTLength }, - '{ idx: ariane_soc::Timer, start_addr: ariane_soc::TimerBase, end_addr: ariane_soc::TimerBase + ariane_soc::TimerLength }, - '{ idx: ariane_soc::SPI, start_addr: ariane_soc::SPIBase, end_addr: ariane_soc::SPIBase + ariane_soc::SPILength }, - '{ idx: ariane_soc::Ethernet, start_addr: ariane_soc::EthernetBase, end_addr: ariane_soc::EthernetBase + ariane_soc::EthernetLength }, - '{ idx: ariane_soc::GPIO, start_addr: ariane_soc::GPIOBase, end_addr: ariane_soc::GPIOBase + ariane_soc::GPIOLength }, - '{ idx: ariane_soc::DRAM, start_addr: ariane_soc::DRAMBase, end_addr: ariane_soc::DRAMBase + ariane_soc::DRAMLength } -}; - -localparam axi_pkg::xbar_cfg_t AXI_XBAR_CFG = '{ - NoSlvPorts: ariane_soc::NrSlaves, - NoMstPorts: ariane_soc::NB_PERIPHERALS, - MaxMstTrans: 1, // Probably requires update - MaxSlvTrans: 1, // Probably requires update - FallThrough: 1'b0, - LatencyMode: axi_pkg::CUT_ALL_PORTS, - AxiIdWidthSlvPorts: AxiIdWidthMaster, - AxiIdUsedSlvPorts: AxiIdWidthMaster, - UniqueIds: 1'b0, - AxiAddrWidth: AxiAddrWidth, - AxiDataWidth: AxiDataWidth, - NoAddrRules: ariane_soc::NB_PERIPHERALS -}; - -axi_xbar_intf #( - .AXI_USER_WIDTH ( AxiUserWidth ), - .Cfg ( AXI_XBAR_CFG ), - .rule_t ( axi_pkg::xbar_rule_64_t ) -) i_axi_xbar ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .test_i ( test_en ), - .slv_ports ( slave ), - .mst_ports ( master ), - .addr_map_i ( addr_map ), - .en_default_mst_port_i ( '0 ), - .default_mst_port_i ( '0 ) -); + assign rst_n = ~ddr_sync_reset; + assign rst = ddr_sync_reset; + + // --------------- + // AXI Xbar + // --------------- + + axi_pkg::xbar_rule_64_t [ariane_soc::NB_PERIPHERALS-1:0] addr_map; + + assign addr_map = '{ + '{ + idx: ariane_soc::Debug, + start_addr: ariane_soc::DebugBase, + end_addr: ariane_soc::DebugBase + ariane_soc::DebugLength + }, + '{ + idx: ariane_soc::ROM, + start_addr: ariane_soc::ROMBase, + end_addr: ariane_soc::ROMBase + ariane_soc::ROMLength + }, + '{ + idx: ariane_soc::CLINT, + start_addr: ariane_soc::CLINTBase, + end_addr: ariane_soc::CLINTBase + ariane_soc::CLINTLength + }, + '{ + idx: ariane_soc::PLIC, + start_addr: ariane_soc::PLICBase, + end_addr: ariane_soc::PLICBase + ariane_soc::PLICLength + }, + '{ + idx: ariane_soc::UART, + start_addr: ariane_soc::UARTBase, + end_addr: ariane_soc::UARTBase + ariane_soc::UARTLength + }, + '{ + idx: ariane_soc::Timer, + start_addr: ariane_soc::TimerBase, + end_addr: ariane_soc::TimerBase + ariane_soc::TimerLength + }, + '{ + idx: ariane_soc::SPI, + start_addr: ariane_soc::SPIBase, + end_addr: ariane_soc::SPIBase + ariane_soc::SPILength + }, + '{ + idx: ariane_soc::Ethernet, + start_addr: ariane_soc::EthernetBase, + end_addr: ariane_soc::EthernetBase + ariane_soc::EthernetLength + }, + '{ + idx: ariane_soc::GPIO, + start_addr: ariane_soc::GPIOBase, + end_addr: ariane_soc::GPIOBase + ariane_soc::GPIOLength + }, + '{ + idx: ariane_soc::DRAM, + start_addr: ariane_soc::DRAMBase, + end_addr: ariane_soc::DRAMBase + ariane_soc::DRAMLength + } + }; + + localparam axi_pkg::xbar_cfg_t AXI_XBAR_CFG = '{ + NoSlvPorts: ariane_soc::NrSlaves, + NoMstPorts: ariane_soc::NB_PERIPHERALS, + MaxMstTrans: 1, // Probably requires update + MaxSlvTrans: 1, // Probably requires update + FallThrough: 1'b0, + LatencyMode: axi_pkg::CUT_ALL_PORTS, + AxiIdWidthSlvPorts: AxiIdWidthMaster, + AxiIdUsedSlvPorts: AxiIdWidthMaster, + UniqueIds: 1'b0, + AxiAddrWidth: AxiAddrWidth, + AxiDataWidth: AxiDataWidth, + NoAddrRules: ariane_soc::NB_PERIPHERALS + }; + + axi_xbar_intf #( + .AXI_USER_WIDTH(AxiUserWidth), + .Cfg (AXI_XBAR_CFG), + .rule_t (axi_pkg::xbar_rule_64_t) + ) i_axi_xbar ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .test_i (test_en), + .slv_ports (slave), + .mst_ports (master), + .addr_map_i (addr_map), + .en_default_mst_port_i('0), + .default_mst_port_i ('0) + ); -// --------------- -// Debug Module -// --------------- -dmi_jtag i_dmi_jtag ( - .clk_i ( clk ), - .rst_ni ( rst_n ), - .dmi_rst_no ( ), // keep open - .testmode_i ( test_en ), - .dmi_req_valid_o ( debug_req_valid ), - .dmi_req_ready_i ( debug_req_ready ), - .dmi_req_o ( debug_req ), - .dmi_resp_valid_i ( debug_resp_valid ), - .dmi_resp_ready_o ( debug_resp_ready ), - .dmi_resp_i ( debug_resp ), - .tck_i ( tck ), - .tms_i ( tms ), - .trst_ni ( trst_n ), - .td_i ( tdi ), - .td_o ( tdo ), - .tdo_oe_o ( ) -); + // --------------- + // Debug Module + // --------------- + dmi_jtag i_dmi_jtag ( + .clk_i (clk), + .rst_ni (rst_n), + .dmi_rst_no (), // keep open + .testmode_i (test_en), + .dmi_req_valid_o (debug_req_valid), + .dmi_req_ready_i (debug_req_ready), + .dmi_req_o (debug_req), + .dmi_resp_valid_i(debug_resp_valid), + .dmi_resp_ready_o(debug_resp_ready), + .dmi_resp_i (debug_resp), + .tck_i (tck), + .tms_i (tms), + .trst_ni (trst_n), + .td_i (tdi), + .td_o (tdo), + .tdo_oe_o () + ); -ariane_axi::req_t dm_axi_m_req; -ariane_axi::resp_t dm_axi_m_resp; - - -logic dm_slave_req; -logic dm_slave_we; -logic [CVA6Cfg.XLEN-1:0] dm_slave_addr; -logic [CVA6Cfg.XLEN/8-1:0] dm_slave_be; -logic [CVA6Cfg.XLEN-1:0] dm_slave_wdata; -logic [CVA6Cfg.XLEN-1:0] dm_slave_rdata; - -logic dm_master_req; -logic [CVA6Cfg.XLEN-1:0] dm_master_add; -logic dm_master_we; -logic [CVA6Cfg.XLEN-1:0] dm_master_wdata; -logic [CVA6Cfg.XLEN/8-1:0] dm_master_be; -logic dm_master_gnt; -logic dm_master_r_valid; -logic [CVA6Cfg.XLEN-1:0] dm_master_r_rdata; - -// debug module -dm_top #( - .NrHarts ( 1 ), - .BusWidth ( CVA6Cfg.XLEN ), - .SelectableHarts ( 1'b1 ) -) i_dm_top ( - .clk_i ( clk ), - .rst_ni ( rst_n ), // PoR - .testmode_i ( test_en ), - .ndmreset_o ( ndmreset ), - .dmactive_o ( dmactive ), // active debug session - .debug_req_o ( debug_req_irq ), - .unavailable_i ( '0 ), - .hartinfo_i ( {ariane_pkg::DebugHartInfo} ), - .slave_req_i ( dm_slave_req ), - .slave_we_i ( dm_slave_we ), - .slave_addr_i ( dm_slave_addr ), - .slave_be_i ( dm_slave_be ), - .slave_wdata_i ( dm_slave_wdata ), - .slave_rdata_o ( dm_slave_rdata ), - .master_req_o ( dm_master_req ), - .master_add_o ( dm_master_add ), - .master_we_o ( dm_master_we ), - .master_wdata_o ( dm_master_wdata ), - .master_be_o ( dm_master_be ), - .master_gnt_i ( dm_master_gnt ), - .master_r_valid_i ( dm_master_r_valid ), - .master_r_rdata_i ( dm_master_r_rdata ), - .dmi_rst_ni ( rst_n ), - .dmi_req_valid_i ( debug_req_valid ), - .dmi_req_ready_o ( debug_req_ready ), - .dmi_req_i ( debug_req ), - .dmi_resp_valid_o ( debug_resp_valid ), - .dmi_resp_ready_i ( debug_resp_ready ), - .dmi_resp_o ( debug_resp ) -); + ariane_axi::req_t dm_axi_m_req; + ariane_axi::resp_t dm_axi_m_resp; + + + logic dm_slave_req; + logic dm_slave_we; + logic [ CVA6Cfg.XLEN-1:0] dm_slave_addr; + logic [CVA6Cfg.XLEN/8-1:0] dm_slave_be; + logic [ CVA6Cfg.XLEN-1:0] dm_slave_wdata; + logic [ CVA6Cfg.XLEN-1:0] dm_slave_rdata; + + logic dm_master_req; + logic [ CVA6Cfg.XLEN-1:0] dm_master_add; + logic dm_master_we; + logic [ CVA6Cfg.XLEN-1:0] dm_master_wdata; + logic [CVA6Cfg.XLEN/8-1:0] dm_master_be; + logic dm_master_gnt; + logic dm_master_r_valid; + logic [ CVA6Cfg.XLEN-1:0] dm_master_r_rdata; + + // debug module + dm_top #( + .NrHarts (1), + .BusWidth (CVA6Cfg.XLEN), + .SelectableHarts(1'b1) + ) i_dm_top ( + .clk_i (clk), + .rst_ni (rst_n), // PoR + .testmode_i (test_en), + .ndmreset_o (ndmreset), + .dmactive_o (dmactive), // active debug session + .debug_req_o (debug_req_irq), + .unavailable_i ('0), + .hartinfo_i ({ariane_pkg::DebugHartInfo}), + .slave_req_i (dm_slave_req), + .slave_we_i (dm_slave_we), + .slave_addr_i (dm_slave_addr), + .slave_be_i (dm_slave_be), + .slave_wdata_i (dm_slave_wdata), + .slave_rdata_o (dm_slave_rdata), + .master_req_o (dm_master_req), + .master_add_o (dm_master_add), + .master_we_o (dm_master_we), + .master_wdata_o (dm_master_wdata), + .master_be_o (dm_master_be), + .master_gnt_i (dm_master_gnt), + .master_r_valid_i(dm_master_r_valid), + .master_r_rdata_i(dm_master_r_rdata), + .dmi_rst_ni (rst_n), + .dmi_req_valid_i (debug_req_valid), + .dmi_req_ready_o (debug_req_ready), + .dmi_req_i (debug_req), + .dmi_resp_valid_o(debug_resp_valid), + .dmi_resp_ready_i(debug_resp_ready), + .dmi_resp_o (debug_resp) + ); -axi2mem #( - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_ADDR_WIDTH ( CVA6Cfg.XLEN ), - .AXI_DATA_WIDTH ( CVA6Cfg.XLEN ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) i_dm_axi2mem ( - .clk_i ( clk ), - .rst_ni ( rst_n ), - .slave ( master_to_dm[0] ), - .req_o ( dm_slave_req ), - .we_o ( dm_slave_we ), - .addr_o ( dm_slave_addr ), - .be_o ( dm_slave_be ), - .data_o ( dm_slave_wdata ), - .data_i ( dm_slave_rdata ) -); + axi2mem #( + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_ADDR_WIDTH(CVA6Cfg.XLEN), + .AXI_DATA_WIDTH(CVA6Cfg.XLEN), + .AXI_USER_WIDTH(AxiUserWidth) + ) i_dm_axi2mem ( + .clk_i (clk), + .rst_ni(rst_n), + .slave (master_to_dm[0]), + .req_o (dm_slave_req), + .we_o (dm_slave_we), + .addr_o(dm_slave_addr), + .be_o (dm_slave_be), + .data_o(dm_slave_wdata), + .data_i(dm_slave_rdata) + ); -if (CVA6Cfg.XLEN==32 ) begin + if (CVA6Cfg.XLEN == 32) begin assign master_to_dm[0].aw_user = '0; assign master_to_dm[0].w_user = '0; @@ -471,10 +513,10 @@ if (CVA6Cfg.XLEN==32 ) begin assign master_to_dm[0].aw_id = dm_axi_m_req.aw.id; assign master_to_dm[0].ar_id = dm_axi_m_req.ar.id; - assign master[ariane_soc::Debug].r_user ='0; - assign master[ariane_soc::Debug].b_user ='0; + assign master[ariane_soc::Debug].r_user = '0; + assign master[ariane_soc::Debug].b_user = '0; - xlnx_axi_dwidth_converter_dm_slave i_axi_dwidth_converter_dm_slave( + xlnx_axi_dwidth_converter_dm_slave i_axi_dwidth_converter_dm_slave ( .s_axi_aclk(clk), .s_axi_aresetn(ndmreset_n), .s_axi_awid(master[ariane_soc::Debug].aw_id), @@ -527,7 +569,7 @@ if (CVA6Cfg.XLEN==32 ) begin .m_axi_awqos(master_to_dm[0].aw_qos), .m_axi_awvalid(master_to_dm[0].aw_valid), .m_axi_awready(master_to_dm[0].aw_ready), - .m_axi_wdata(master_to_dm[0].w_data ), + .m_axi_wdata(master_to_dm[0].w_data), .m_axi_wstrb(master_to_dm[0].w_strb), .m_axi_wlast(master_to_dm[0].w_last), .m_axi_wvalid(master_to_dm[0].w_valid), @@ -553,7 +595,7 @@ if (CVA6Cfg.XLEN==32 ) begin .m_axi_rready(master_to_dm[0].r_ready) ); -end else begin + end else begin assign master[ariane_soc::Debug].aw_id = master_to_dm[0].aw_id; assign master[ariane_soc::Debug].aw_addr = master_to_dm[0].aw_addr; @@ -569,7 +611,7 @@ end else begin assign master[ariane_soc::Debug].aw_user = master_to_dm[0].aw_user; assign master[ariane_soc::Debug].aw_valid = master_to_dm[0].aw_valid; - assign master_to_dm[0].aw_ready =master[ariane_soc::Debug].aw_ready; + assign master_to_dm[0].aw_ready = master[ariane_soc::Debug].aw_ready; assign master[ariane_soc::Debug].w_data = master_to_dm[0].w_data; assign master[ariane_soc::Debug].w_strb = master_to_dm[0].w_strb; @@ -577,12 +619,12 @@ end else begin assign master[ariane_soc::Debug].w_user = master_to_dm[0].w_user; assign master[ariane_soc::Debug].w_valid = master_to_dm[0].w_valid; - assign master_to_dm[0].w_ready =master[ariane_soc::Debug].w_ready; + assign master_to_dm[0].w_ready = master[ariane_soc::Debug].w_ready; - assign master_to_dm[0].b_id =master[ariane_soc::Debug].b_id; - assign master_to_dm[0].b_resp =master[ariane_soc::Debug].b_resp; - assign master_to_dm[0].b_user =master[ariane_soc::Debug].b_user; - assign master_to_dm[0].b_valid =master[ariane_soc::Debug].b_valid; + assign master_to_dm[0].b_id = master[ariane_soc::Debug].b_id; + assign master_to_dm[0].b_resp = master[ariane_soc::Debug].b_resp; + assign master_to_dm[0].b_user = master[ariane_soc::Debug].b_user; + assign master_to_dm[0].b_valid = master[ariane_soc::Debug].b_valid; assign master[ariane_soc::Debug].b_ready = master_to_dm[0].b_ready; @@ -599,53 +641,53 @@ end else begin assign master[ariane_soc::Debug].ar_user = master_to_dm[0].ar_user; assign master[ariane_soc::Debug].ar_valid = master_to_dm[0].ar_valid; - assign master_to_dm[0].ar_ready =master[ariane_soc::Debug].ar_ready; + assign master_to_dm[0].ar_ready = master[ariane_soc::Debug].ar_ready; - assign master_to_dm[0].r_id =master[ariane_soc::Debug].r_id; - assign master_to_dm[0].r_data =master[ariane_soc::Debug].r_data; - assign master_to_dm[0].r_resp =master[ariane_soc::Debug].r_resp; - assign master_to_dm[0].r_last =master[ariane_soc::Debug].r_last; - assign master_to_dm[0].r_user =master[ariane_soc::Debug].r_user; - assign master_to_dm[0].r_valid =master[ariane_soc::Debug].r_valid; + assign master_to_dm[0].r_id = master[ariane_soc::Debug].r_id; + assign master_to_dm[0].r_data = master[ariane_soc::Debug].r_data; + assign master_to_dm[0].r_resp = master[ariane_soc::Debug].r_resp; + assign master_to_dm[0].r_last = master[ariane_soc::Debug].r_last; + assign master_to_dm[0].r_user = master[ariane_soc::Debug].r_user; + assign master_to_dm[0].r_valid = master[ariane_soc::Debug].r_valid; assign master[ariane_soc::Debug].r_ready = master_to_dm[0].r_ready; -end - - - -logic [1:0] axi_adapter_size; - -assign axi_adapter_size = (CVA6Cfg.XLEN == 64) ? 2'b11 : 2'b10; - -axi_adapter #( - .CVA6Cfg ( CVA6Cfg ), - .DATA_WIDTH ( CVA6Cfg.XLEN ), - .axi_req_t ( ariane_axi::req_t ), - .axi_rsp_t ( ariane_axi::resp_t ) -) i_dm_axi_master ( - .clk_i ( clk ), - .rst_ni ( rst_n ), - .req_i ( dm_master_req ), - .type_i ( ariane_pkg::SINGLE_REQ ), - .amo_i ( ariane_pkg::AMO_NONE ), - .gnt_o ( dm_master_gnt ), - .addr_i ( dm_master_add ), - .we_i ( dm_master_we ), - .wdata_i ( dm_master_wdata ), - .be_i ( dm_master_be ), - .size_i ( axi_adapter_size ), - .id_i ( '0 ), - .valid_o ( dm_master_r_valid ), - .rdata_o ( dm_master_r_rdata ), - .id_o ( ), - .critical_word_o ( ), - .critical_word_valid_o ( ), - .axi_req_o ( dm_axi_m_req ), - .axi_resp_i ( dm_axi_m_resp ) -); + end + + + + logic [1:0] axi_adapter_size; + + assign axi_adapter_size = (CVA6Cfg.XLEN == 64) ? 2'b11 : 2'b10; + + axi_adapter #( + .CVA6Cfg (CVA6Cfg), + .DATA_WIDTH(CVA6Cfg.XLEN), + .axi_req_t (ariane_axi::req_t), + .axi_rsp_t (ariane_axi::resp_t) + ) i_dm_axi_master ( + .clk_i (clk), + .rst_ni (rst_n), + .req_i (dm_master_req), + .type_i (ariane_pkg::SINGLE_REQ), + .amo_i (ariane_pkg::AMO_NONE), + .gnt_o (dm_master_gnt), + .addr_i (dm_master_add), + .we_i (dm_master_we), + .wdata_i (dm_master_wdata), + .be_i (dm_master_be), + .size_i (axi_adapter_size), + .id_i ('0), + .valid_o (dm_master_r_valid), + .rdata_o (dm_master_r_rdata), + .id_o (), + .critical_word_o (), + .critical_word_valid_o(), + .axi_req_o (dm_axi_m_req), + .axi_resp_i (dm_axi_m_resp) + ); -if (CVA6Cfg.XLEN==32 ) begin + if (CVA6Cfg.XLEN == 32) begin logic [31 : 0] dm_master_m_awaddr; logic [31 : 0] dm_master_m_araddr; @@ -664,7 +706,7 @@ if (CVA6Cfg.XLEN==32 ) begin assign slave[1].ar_id = dm_axi_m_req.ar.id; assign slave[1].aw_atop = dm_axi_m_req.aw.atop; - xlnx_axi_dwidth_converter_dm_master i_axi_dwidth_converter_dm_master( + xlnx_axi_dwidth_converter_dm_master i_axi_dwidth_converter_dm_master ( .s_axi_aclk(clk), .s_axi_aresetn(ndmreset_n), .s_axi_awid(dm_axi_m_req.aw.id), @@ -717,7 +759,7 @@ if (CVA6Cfg.XLEN==32 ) begin .m_axi_awqos(slave[1].aw_qos), .m_axi_awvalid(slave[1].aw_valid), .m_axi_awready(slave[1].aw_ready), - .m_axi_wdata(slave[1].w_data ), + .m_axi_wdata(slave[1].w_data), .m_axi_wstrb(slave[1].w_strb), .m_axi_wlast(slave[1].w_last), .m_axi_wvalid(slave[1].w_valid), @@ -741,1170 +783,1174 @@ if (CVA6Cfg.XLEN==32 ) begin .m_axi_rlast(slave[1].r_last), .m_axi_rvalid(slave[1].r_valid), .m_axi_rready(slave[1].r_ready) - ); -end else begin + ); + end else begin `AXI_ASSIGN_FROM_REQ(slave[1], dm_axi_m_req) `AXI_ASSIGN_TO_RESP(dm_axi_m_resp, slave[1]) -end - - -// --------------- -// Core -// --------------- -ariane_axi::req_t axi_ariane_req; -ariane_axi::resp_t axi_ariane_resp; - -ariane #( - .CVA6Cfg ( CVA6Cfg ), - .rvfi_probes_instr_t ( rvfi_probes_instr_t ), - .rvfi_probes_csr_t ( rvfi_probes_csr_t ), - .rvfi_probes_t ( rvfi_probes_t ) -) i_ariane ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .boot_addr_i ( ariane_soc::ROMBase ), // start fetching from ROM - .hart_id_i ( '0 ), - .irq_i ( irq ), - .ipi_i ( ipi ), - .time_irq_i ( timer_irq ), - .rvfi_probes_o( /* open */ ), - .debug_req_i ( debug_req_irq ), - .noc_req_o ( axi_ariane_req ), - .noc_resp_i ( axi_ariane_resp ), - .tip_o (/* open */) -); + end -`AXI_ASSIGN_FROM_REQ(slave[0], axi_ariane_req) -`AXI_ASSIGN_TO_RESP(axi_ariane_resp, slave[0]) -// --------------- -// CLINT -// --------------- -// divide clock by two -always_ff @(posedge clk or negedge ndmreset_n) begin - if (~ndmreset_n) begin - rtc <= 0; - end else begin - rtc <= rtc ^ 1'b1; + // --------------- + // Core + // --------------- + ariane_axi::req_t axi_ariane_req; + ariane_axi::resp_t axi_ariane_resp; + + ariane #( + .CVA6Cfg(CVA6Cfg), + .rvfi_probes_instr_t(rvfi_probes_instr_t), + .rvfi_probes_csr_t(rvfi_probes_csr_t), + .rvfi_probes_t(rvfi_probes_t), + .IsTIP(IsTIP) + ) i_ariane ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .boot_addr_i (ariane_soc::ROMBase), // start fetching from ROM + .hart_id_i ('0), + .irq_i (irq), + .ipi_i (ipi), + .time_irq_i (timer_irq), + .rvfi_probes_o( /* open */), + .debug_req_i (debug_req_irq), + .noc_req_o (axi_ariane_req), + .noc_resp_i (axi_ariane_resp), + .tip_o ( /* open */) + ); + + `AXI_ASSIGN_FROM_REQ(slave[0], axi_ariane_req) + `AXI_ASSIGN_TO_RESP(axi_ariane_resp, slave[0]) + + // --------------- + // CLINT + // --------------- + // divide clock by two + always_ff @(posedge clk or negedge ndmreset_n) begin + if (~ndmreset_n) begin + rtc <= 0; + end else begin + rtc <= rtc ^ 1'b1; + end end -end - -axi_slave_req_t axi_clint_req; -axi_slave_resp_t axi_clint_resp; - -clint #( - .CVA6Cfg ( CVA6Cfg ), - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .NR_CORES ( 1 ), - .axi_req_t ( axi_slave_req_t ), - .axi_resp_t ( axi_slave_resp_t ) -) i_clint ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .testmode_i ( test_en ), - .axi_req_i ( axi_clint_req ), - .axi_resp_o ( axi_clint_resp ), - .rtc_i ( rtc ), - .timer_irq_o ( timer_irq ), - .ipi_o ( ipi ) -); -`AXI_ASSIGN_TO_REQ(axi_clint_req, master[ariane_soc::CLINT]) -`AXI_ASSIGN_FROM_RESP(master[ariane_soc::CLINT], axi_clint_resp) - -// --------------- -// ROM -// --------------- -axi2mem #( - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) i_axi2rom ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .slave ( master[ariane_soc::ROM] ), - .req_o ( rom_req ), - .we_o ( ), - .addr_o ( rom_addr ), - .be_o ( ), - .data_o ( ), - .data_i ( rom_rdata ) -); + axi_slave_req_t axi_clint_req; + axi_slave_resp_t axi_clint_resp; + + clint #( + .CVA6Cfg (CVA6Cfg), + .AXI_ADDR_WIDTH(AxiAddrWidth), + .AXI_DATA_WIDTH(AxiDataWidth), + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .NR_CORES (1), + .axi_req_t (axi_slave_req_t), + .axi_resp_t (axi_slave_resp_t) + ) i_clint ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .testmode_i (test_en), + .axi_req_i (axi_clint_req), + .axi_resp_o (axi_clint_resp), + .rtc_i (rtc), + .timer_irq_o(timer_irq), + .ipi_o (ipi) + ); + + `AXI_ASSIGN_TO_REQ(axi_clint_req, master[ariane_soc::CLINT]) + `AXI_ASSIGN_FROM_RESP(master[ariane_soc::CLINT], axi_clint_resp) + + // --------------- + // ROM + // --------------- + axi2mem #( + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_ADDR_WIDTH(AxiAddrWidth), + .AXI_DATA_WIDTH(AxiDataWidth), + .AXI_USER_WIDTH(AxiUserWidth) + ) i_axi2rom ( + .clk_i (clk), + .rst_ni(ndmreset_n), + .slave (master[ariane_soc::ROM]), + .req_o (rom_req), + .we_o (), + .addr_o(rom_addr), + .be_o (), + .data_o(), + .data_i(rom_rdata) + ); -if (CVA6Cfg.XLEN==32 ) begin + if (CVA6Cfg.XLEN == 32) begin bootrom_32 i_bootrom ( - .clk_i ( clk ), - .req_i ( rom_req ), - .addr_i ( rom_addr ), - .rdata_o ( rom_rdata ) + .clk_i (clk), + .req_i (rom_req), + .addr_i (rom_addr), + .rdata_o(rom_rdata) ); -end else begin + end else begin bootrom_64 i_bootrom ( - .clk_i ( clk ), - .req_i ( rom_req ), - .addr_i ( rom_addr ), - .rdata_o ( rom_rdata ) + .clk_i (clk), + .req_i (rom_req), + .addr_i (rom_addr), + .rdata_o(rom_rdata) ); -end + end -// --------------- -// Peripherals -// --------------- + // --------------- + // Peripherals + // --------------- `ifdef KC705 logic [7:0] unused_led; logic [3:0] unused_switches = 4'b0000; `endif -logic clk_200MHz_ref; - -ariane_peripherals #( - .AxiAddrWidth ( AxiAddrWidth ), - .AxiDataWidth ( AxiDataWidth ), - .AxiIdWidth ( AxiIdWidthSlaves ), - .AxiUserWidth ( AxiUserWidth ), - .InclUART ( 1'b1 ), - .InclGPIO ( 1'b1 ), - `ifdef KINTEX7 - .InclSPI ( 1'b1 ), - .InclEthernet ( 1'b1 ) - `elsif KC705 - .InclSPI ( 1'b1 ), - .InclEthernet ( 1'b0 ) // Ethernet requires RAMB16 fpga/src/ariane-ethernet/dualmem_widen8.sv to be defined - `elsif VC707 - .InclSPI ( 1'b1 ), - .InclEthernet ( 1'b0 ) - `elsif VCU118 - .InclSPI ( 1'b0 ), - .InclEthernet ( 1'b0 ) - `elsif NEXYS_VIDEO - .InclSPI ( 1'b1 ), - .InclEthernet ( 1'b0 ) - `endif -) i_ariane_peripherals ( - .clk_i ( clk ), - .clk_200MHz_i ( clk_200MHz_ref ), - .rst_ni ( ndmreset_n ), - .plic ( master[ariane_soc::PLIC] ), - .uart ( master[ariane_soc::UART] ), - .spi ( master[ariane_soc::SPI] ), - .gpio ( master[ariane_soc::GPIO] ), - .eth_clk_i ( eth_clk ), - .ethernet ( master[ariane_soc::Ethernet] ), - .timer ( master[ariane_soc::Timer] ), - .irq_o ( irq ), - .rx_i ( rx ), - .tx_o ( tx ), - .eth_txck, - .eth_rxck, - .eth_rxctl, - .eth_rxd, - .eth_rst_n, - .eth_txctl, - .eth_txd, - .eth_mdio, - .eth_mdc, - .phy_tx_clk_i ( phy_tx_clk ), - .sd_clk_i ( sd_clk_sys ), - .spi_clk_o ( spi_clk_o ), - .spi_mosi ( spi_mosi ), - .spi_miso ( spi_miso ), - .spi_ss ( spi_ss ), - `ifdef KC705 - .leds_o ( {led[3:0], unused_led[7:4]}), - .dip_switches_i ( {sw, unused_switches} ) - `else - .leds_o ( led ), - .dip_switches_i ( sw ) - `endif -); + logic clk_200MHz_ref; + ariane_peripherals #( + .AxiAddrWidth(AxiAddrWidth), + .AxiDataWidth(AxiDataWidth), + .AxiIdWidth(AxiIdWidthSlaves), + .AxiUserWidth(AxiUserWidth), + .InclUART(1'b1), + .InclGPIO(1'b1), +`ifdef KINTEX7 + .InclSPI(1'b1), + .InclEthernet(1'b1) +`elsif KC705 + .InclSPI(1'b1), + .InclEthernet ( 1'b0 ) // Ethernet requires RAMB16 fpga/src/ariane-ethernet/dualmem_widen8.sv to be defined +`elsif VC707 + .InclSPI(1'b1), + .InclEthernet(1'b0) +`elsif VCU118 + .InclSPI(1'b0), + .InclEthernet(1'b0) +`elsif NEXYS_VIDEO + .InclSPI(1'b1), + .InclEthernet(1'b0) +`endif + ) i_ariane_peripherals ( + .clk_i (clk), + .clk_200MHz_i (clk_200MHz_ref), + .rst_ni (ndmreset_n), + .plic (master[ariane_soc::PLIC]), + .uart (master[ariane_soc::UART]), + .spi (master[ariane_soc::SPI]), + .gpio (master[ariane_soc::GPIO]), + .eth_clk_i (eth_clk), + .ethernet (master[ariane_soc::Ethernet]), + .timer (master[ariane_soc::Timer]), + .irq_o (irq), + .rx_i (rx), + .tx_o (tx), + .eth_txck, + .eth_rxck, + .eth_rxctl, + .eth_rxd, + .eth_rst_n, + .eth_txctl, + .eth_txd, + .eth_mdio, + .eth_mdc, + .phy_tx_clk_i (phy_tx_clk), + .sd_clk_i (sd_clk_sys), + .spi_clk_o (spi_clk_o), + .spi_mosi (spi_mosi), + .spi_miso (spi_miso), + .spi_ss (spi_ss), +`ifdef KC705 + .leds_o ({led[3:0], unused_led[7:4]}), + .dip_switches_i({sw, unused_switches}) +`else + .leds_o (led), + .dip_switches_i(sw) +`endif + ); -// --------------------- -// Board peripherals -// --------------------- -// --------------- -// DDR -// --------------- -logic [AxiIdWidthSlaves-1:0] s_axi_awid; -logic [AxiAddrWidth-1:0] s_axi_awaddr; -logic [7:0] s_axi_awlen; -logic [2:0] s_axi_awsize; -logic [1:0] s_axi_awburst; -logic [0:0] s_axi_awlock; -logic [3:0] s_axi_awcache; -logic [2:0] s_axi_awprot; -logic [3:0] s_axi_awregion; -logic [3:0] s_axi_awqos; -logic s_axi_awvalid; -logic s_axi_awready; -logic [AxiDataWidth-1:0] s_axi_wdata; -logic [AxiDataWidth/8-1:0] s_axi_wstrb; -logic s_axi_wlast; -logic s_axi_wvalid; -logic s_axi_wready; -logic [AxiIdWidthSlaves-1:0] s_axi_bid; -logic [1:0] s_axi_bresp; -logic s_axi_bvalid; -logic s_axi_bready; -logic [AxiIdWidthSlaves-1:0] s_axi_arid; -logic [AxiAddrWidth-1:0] s_axi_araddr; -logic [7:0] s_axi_arlen; -logic [2:0] s_axi_arsize; -logic [1:0] s_axi_arburst; -logic [0:0] s_axi_arlock; -logic [3:0] s_axi_arcache; -logic [2:0] s_axi_arprot; -logic [3:0] s_axi_arregion; -logic [3:0] s_axi_arqos; -logic s_axi_arvalid; -logic s_axi_arready; -logic [AxiIdWidthSlaves-1:0] s_axi_rid; -logic [AxiDataWidth-1:0] s_axi_rdata; -logic [1:0] s_axi_rresp; -logic s_axi_rlast; -logic s_axi_rvalid; -logic s_axi_rready; - -AXI_BUS #( - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_USER_WIDTH ( AxiUserWidth ) -) dram(); - -axi_riscv_atomics_wrap #( - .AXI_ADDR_WIDTH ( AxiAddrWidth ), - .AXI_DATA_WIDTH ( AxiDataWidth ), - .AXI_ID_WIDTH ( AxiIdWidthSlaves ), - .AXI_USER_WIDTH ( AxiUserWidth ), - .AXI_MAX_WRITE_TXNS ( 1 ), - .RISCV_WORD_WIDTH ( 64 ) -) i_axi_riscv_atomics ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .slv ( master[ariane_soc::DRAM] ), - .mst ( dram ) -); + + // --------------------- + // Board peripherals + // --------------------- + // --------------- + // DDR + // --------------- + logic [AxiIdWidthSlaves-1:0] s_axi_awid; + logic [ AxiAddrWidth-1:0] s_axi_awaddr; + logic [ 7:0] s_axi_awlen; + logic [ 2:0] s_axi_awsize; + logic [ 1:0] s_axi_awburst; + logic [ 0:0] s_axi_awlock; + logic [ 3:0] s_axi_awcache; + logic [ 2:0] s_axi_awprot; + logic [ 3:0] s_axi_awregion; + logic [ 3:0] s_axi_awqos; + logic s_axi_awvalid; + logic s_axi_awready; + logic [ AxiDataWidth-1:0] s_axi_wdata; + logic [ AxiDataWidth/8-1:0] s_axi_wstrb; + logic s_axi_wlast; + logic s_axi_wvalid; + logic s_axi_wready; + logic [AxiIdWidthSlaves-1:0] s_axi_bid; + logic [ 1:0] s_axi_bresp; + logic s_axi_bvalid; + logic s_axi_bready; + logic [AxiIdWidthSlaves-1:0] s_axi_arid; + logic [ AxiAddrWidth-1:0] s_axi_araddr; + logic [ 7:0] s_axi_arlen; + logic [ 2:0] s_axi_arsize; + logic [ 1:0] s_axi_arburst; + logic [ 0:0] s_axi_arlock; + logic [ 3:0] s_axi_arcache; + logic [ 2:0] s_axi_arprot; + logic [ 3:0] s_axi_arregion; + logic [ 3:0] s_axi_arqos; + logic s_axi_arvalid; + logic s_axi_arready; + logic [AxiIdWidthSlaves-1:0] s_axi_rid; + logic [ AxiDataWidth-1:0] s_axi_rdata; + logic [ 1:0] s_axi_rresp; + logic s_axi_rlast; + logic s_axi_rvalid; + logic s_axi_rready; + + AXI_BUS #( + .AXI_ADDR_WIDTH(AxiAddrWidth), + .AXI_DATA_WIDTH(AxiDataWidth), + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_USER_WIDTH(AxiUserWidth) + ) dram (); + + axi_riscv_atomics_wrap #( + .AXI_ADDR_WIDTH (AxiAddrWidth), + .AXI_DATA_WIDTH (AxiDataWidth), + .AXI_ID_WIDTH (AxiIdWidthSlaves), + .AXI_USER_WIDTH (AxiUserWidth), + .AXI_MAX_WRITE_TXNS(1), + .RISCV_WORD_WIDTH (64) + ) i_axi_riscv_atomics ( + .clk_i (clk), + .rst_ni(ndmreset_n), + .slv (master[ariane_soc::DRAM]), + .mst (dram) + ); `ifdef PROTOCOL_CHECKER -logic pc_status; - -xlnx_protocol_checker i_xlnx_protocol_checker ( - .pc_status(), - .pc_asserted(pc_status), - .aclk(clk), - .aresetn(ndmreset_n), - .pc_axi_awid (dram.aw_id), - .pc_axi_awaddr (dram.aw_addr), - .pc_axi_awlen (dram.aw_len), - .pc_axi_awsize (dram.aw_size), - .pc_axi_awburst (dram.aw_burst), - .pc_axi_awlock (dram.aw_lock), - .pc_axi_awcache (dram.aw_cache), - .pc_axi_awprot (dram.aw_prot), - .pc_axi_awqos (dram.aw_qos), - .pc_axi_awregion (dram.aw_region), - .pc_axi_awuser (dram.aw_user), - .pc_axi_awvalid (dram.aw_valid), - .pc_axi_awready (dram.aw_ready), - .pc_axi_wlast (dram.w_last), - .pc_axi_wdata (dram.w_data), - .pc_axi_wstrb (dram.w_strb), - .pc_axi_wuser (dram.w_user), - .pc_axi_wvalid (dram.w_valid), - .pc_axi_wready (dram.w_ready), - .pc_axi_bid (dram.b_id), - .pc_axi_bresp (dram.b_resp), - .pc_axi_buser (dram.b_user), - .pc_axi_bvalid (dram.b_valid), - .pc_axi_bready (dram.b_ready), - .pc_axi_arid (dram.ar_id), - .pc_axi_araddr (dram.ar_addr), - .pc_axi_arlen (dram.ar_len), - .pc_axi_arsize (dram.ar_size), - .pc_axi_arburst (dram.ar_burst), - .pc_axi_arlock (dram.ar_lock), - .pc_axi_arcache (dram.ar_cache), - .pc_axi_arprot (dram.ar_prot), - .pc_axi_arqos (dram.ar_qos), - .pc_axi_arregion (dram.ar_region), - .pc_axi_aruser (dram.ar_user), - .pc_axi_arvalid (dram.ar_valid), - .pc_axi_arready (dram.ar_ready), - .pc_axi_rid (dram.r_id), - .pc_axi_rlast (dram.r_last), - .pc_axi_rdata (dram.r_data), - .pc_axi_rresp (dram.r_resp), - .pc_axi_ruser (dram.r_user), - .pc_axi_rvalid (dram.r_valid), - .pc_axi_rready (dram.r_ready) -); + logic pc_status; + + xlnx_protocol_checker i_xlnx_protocol_checker ( + .pc_status (), + .pc_asserted (pc_status), + .aclk (clk), + .aresetn (ndmreset_n), + .pc_axi_awid (dram.aw_id), + .pc_axi_awaddr (dram.aw_addr), + .pc_axi_awlen (dram.aw_len), + .pc_axi_awsize (dram.aw_size), + .pc_axi_awburst (dram.aw_burst), + .pc_axi_awlock (dram.aw_lock), + .pc_axi_awcache (dram.aw_cache), + .pc_axi_awprot (dram.aw_prot), + .pc_axi_awqos (dram.aw_qos), + .pc_axi_awregion(dram.aw_region), + .pc_axi_awuser (dram.aw_user), + .pc_axi_awvalid (dram.aw_valid), + .pc_axi_awready (dram.aw_ready), + .pc_axi_wlast (dram.w_last), + .pc_axi_wdata (dram.w_data), + .pc_axi_wstrb (dram.w_strb), + .pc_axi_wuser (dram.w_user), + .pc_axi_wvalid (dram.w_valid), + .pc_axi_wready (dram.w_ready), + .pc_axi_bid (dram.b_id), + .pc_axi_bresp (dram.b_resp), + .pc_axi_buser (dram.b_user), + .pc_axi_bvalid (dram.b_valid), + .pc_axi_bready (dram.b_ready), + .pc_axi_arid (dram.ar_id), + .pc_axi_araddr (dram.ar_addr), + .pc_axi_arlen (dram.ar_len), + .pc_axi_arsize (dram.ar_size), + .pc_axi_arburst (dram.ar_burst), + .pc_axi_arlock (dram.ar_lock), + .pc_axi_arcache (dram.ar_cache), + .pc_axi_arprot (dram.ar_prot), + .pc_axi_arqos (dram.ar_qos), + .pc_axi_arregion(dram.ar_region), + .pc_axi_aruser (dram.ar_user), + .pc_axi_arvalid (dram.ar_valid), + .pc_axi_arready (dram.ar_ready), + .pc_axi_rid (dram.r_id), + .pc_axi_rlast (dram.r_last), + .pc_axi_rdata (dram.r_data), + .pc_axi_rresp (dram.r_resp), + .pc_axi_ruser (dram.r_user), + .pc_axi_rvalid (dram.r_valid), + .pc_axi_rready (dram.r_ready) + ); `endif -assign dram.r_user = '0; -assign dram.b_user = '0; - -xlnx_axi_clock_converter i_xlnx_axi_clock_converter_ddr ( - .s_axi_aclk ( clk ), - .s_axi_aresetn ( ndmreset_n ), - .s_axi_awid ( dram.aw_id ), - .s_axi_awaddr ( dram.aw_addr ), - .s_axi_awlen ( dram.aw_len ), - .s_axi_awsize ( dram.aw_size ), - .s_axi_awburst ( dram.aw_burst ), - .s_axi_awlock ( dram.aw_lock ), - .s_axi_awcache ( dram.aw_cache ), - .s_axi_awprot ( dram.aw_prot ), - .s_axi_awregion ( dram.aw_region ), - .s_axi_awqos ( dram.aw_qos ), - .s_axi_awvalid ( dram.aw_valid ), - .s_axi_awready ( dram.aw_ready ), - .s_axi_wdata ( dram.w_data ), - .s_axi_wstrb ( dram.w_strb ), - .s_axi_wlast ( dram.w_last ), - .s_axi_wvalid ( dram.w_valid ), - .s_axi_wready ( dram.w_ready ), - .s_axi_bid ( dram.b_id ), - .s_axi_bresp ( dram.b_resp ), - .s_axi_bvalid ( dram.b_valid ), - .s_axi_bready ( dram.b_ready ), - .s_axi_arid ( dram.ar_id ), - .s_axi_araddr ( dram.ar_addr ), - .s_axi_arlen ( dram.ar_len ), - .s_axi_arsize ( dram.ar_size ), - .s_axi_arburst ( dram.ar_burst ), - .s_axi_arlock ( dram.ar_lock ), - .s_axi_arcache ( dram.ar_cache ), - .s_axi_arprot ( dram.ar_prot ), - .s_axi_arregion ( dram.ar_region ), - .s_axi_arqos ( dram.ar_qos ), - .s_axi_arvalid ( dram.ar_valid ), - .s_axi_arready ( dram.ar_ready ), - .s_axi_rid ( dram.r_id ), - .s_axi_rdata ( dram.r_data ), - .s_axi_rresp ( dram.r_resp ), - .s_axi_rlast ( dram.r_last ), - .s_axi_rvalid ( dram.r_valid ), - .s_axi_rready ( dram.r_ready ), - // to size converter - .m_axi_aclk ( ddr_clock_out ), - .m_axi_aresetn ( ndmreset_n ), - .m_axi_awid ( s_axi_awid ), - .m_axi_awaddr ( s_axi_awaddr ), - .m_axi_awlen ( s_axi_awlen ), - .m_axi_awsize ( s_axi_awsize ), - .m_axi_awburst ( s_axi_awburst ), - .m_axi_awlock ( s_axi_awlock ), - .m_axi_awcache ( s_axi_awcache ), - .m_axi_awprot ( s_axi_awprot ), - .m_axi_awregion ( s_axi_awregion ), - .m_axi_awqos ( s_axi_awqos ), - .m_axi_awvalid ( s_axi_awvalid ), - .m_axi_awready ( s_axi_awready ), - .m_axi_wdata ( s_axi_wdata ), - .m_axi_wstrb ( s_axi_wstrb ), - .m_axi_wlast ( s_axi_wlast ), - .m_axi_wvalid ( s_axi_wvalid ), - .m_axi_wready ( s_axi_wready ), - .m_axi_bid ( s_axi_bid ), - .m_axi_bresp ( s_axi_bresp ), - .m_axi_bvalid ( s_axi_bvalid ), - .m_axi_bready ( s_axi_bready ), - .m_axi_arid ( s_axi_arid ), - .m_axi_araddr ( s_axi_araddr ), - .m_axi_arlen ( s_axi_arlen ), - .m_axi_arsize ( s_axi_arsize ), - .m_axi_arburst ( s_axi_arburst ), - .m_axi_arlock ( s_axi_arlock ), - .m_axi_arcache ( s_axi_arcache ), - .m_axi_arprot ( s_axi_arprot ), - .m_axi_arregion ( s_axi_arregion ), - .m_axi_arqos ( s_axi_arqos ), - .m_axi_arvalid ( s_axi_arvalid ), - .m_axi_arready ( s_axi_arready ), - .m_axi_rid ( s_axi_rid ), - .m_axi_rdata ( s_axi_rdata ), - .m_axi_rresp ( s_axi_rresp ), - .m_axi_rlast ( s_axi_rlast ), - .m_axi_rvalid ( s_axi_rvalid ), - .m_axi_rready ( s_axi_rready ) -); + assign dram.r_user = '0; + assign dram.b_user = '0; + + xlnx_axi_clock_converter i_xlnx_axi_clock_converter_ddr ( + .s_axi_aclk (clk), + .s_axi_aresetn (ndmreset_n), + .s_axi_awid (dram.aw_id), + .s_axi_awaddr (dram.aw_addr), + .s_axi_awlen (dram.aw_len), + .s_axi_awsize (dram.aw_size), + .s_axi_awburst (dram.aw_burst), + .s_axi_awlock (dram.aw_lock), + .s_axi_awcache (dram.aw_cache), + .s_axi_awprot (dram.aw_prot), + .s_axi_awregion(dram.aw_region), + .s_axi_awqos (dram.aw_qos), + .s_axi_awvalid (dram.aw_valid), + .s_axi_awready (dram.aw_ready), + .s_axi_wdata (dram.w_data), + .s_axi_wstrb (dram.w_strb), + .s_axi_wlast (dram.w_last), + .s_axi_wvalid (dram.w_valid), + .s_axi_wready (dram.w_ready), + .s_axi_bid (dram.b_id), + .s_axi_bresp (dram.b_resp), + .s_axi_bvalid (dram.b_valid), + .s_axi_bready (dram.b_ready), + .s_axi_arid (dram.ar_id), + .s_axi_araddr (dram.ar_addr), + .s_axi_arlen (dram.ar_len), + .s_axi_arsize (dram.ar_size), + .s_axi_arburst (dram.ar_burst), + .s_axi_arlock (dram.ar_lock), + .s_axi_arcache (dram.ar_cache), + .s_axi_arprot (dram.ar_prot), + .s_axi_arregion(dram.ar_region), + .s_axi_arqos (dram.ar_qos), + .s_axi_arvalid (dram.ar_valid), + .s_axi_arready (dram.ar_ready), + .s_axi_rid (dram.r_id), + .s_axi_rdata (dram.r_data), + .s_axi_rresp (dram.r_resp), + .s_axi_rlast (dram.r_last), + .s_axi_rvalid (dram.r_valid), + .s_axi_rready (dram.r_ready), + // to size converter + .m_axi_aclk (ddr_clock_out), + .m_axi_aresetn (ndmreset_n), + .m_axi_awid (s_axi_awid), + .m_axi_awaddr (s_axi_awaddr), + .m_axi_awlen (s_axi_awlen), + .m_axi_awsize (s_axi_awsize), + .m_axi_awburst (s_axi_awburst), + .m_axi_awlock (s_axi_awlock), + .m_axi_awcache (s_axi_awcache), + .m_axi_awprot (s_axi_awprot), + .m_axi_awregion(s_axi_awregion), + .m_axi_awqos (s_axi_awqos), + .m_axi_awvalid (s_axi_awvalid), + .m_axi_awready (s_axi_awready), + .m_axi_wdata (s_axi_wdata), + .m_axi_wstrb (s_axi_wstrb), + .m_axi_wlast (s_axi_wlast), + .m_axi_wvalid (s_axi_wvalid), + .m_axi_wready (s_axi_wready), + .m_axi_bid (s_axi_bid), + .m_axi_bresp (s_axi_bresp), + .m_axi_bvalid (s_axi_bvalid), + .m_axi_bready (s_axi_bready), + .m_axi_arid (s_axi_arid), + .m_axi_araddr (s_axi_araddr), + .m_axi_arlen (s_axi_arlen), + .m_axi_arsize (s_axi_arsize), + .m_axi_arburst (s_axi_arburst), + .m_axi_arlock (s_axi_arlock), + .m_axi_arcache (s_axi_arcache), + .m_axi_arprot (s_axi_arprot), + .m_axi_arregion(s_axi_arregion), + .m_axi_arqos (s_axi_arqos), + .m_axi_arvalid (s_axi_arvalid), + .m_axi_arready (s_axi_arready), + .m_axi_rid (s_axi_rid), + .m_axi_rdata (s_axi_rdata), + .m_axi_rresp (s_axi_rresp), + .m_axi_rlast (s_axi_rlast), + .m_axi_rvalid (s_axi_rvalid), + .m_axi_rready (s_axi_rready) + ); `ifdef NEXYS_VIDEO -xlnx_clk_gen i_xlnx_clk_gen ( - .clk_out1 ( clk ), // 25 MHz - .clk_out2 ( phy_tx_clk ), // 125 MHz (for RGMII PHY) - .clk_out3 ( eth_clk ), // 125 MHz quadrature (90 deg phase shift) - .clk_out4 ( sd_clk_sys ), // 50 MHz clock - .clk_out5 ( clk_200MHz_ref ), // 200 MHz clock - .reset ( cpu_reset ), - .locked ( pll_locked ), - .clk_in1 ( ddr_clock_out ) // 100MHz input clock -); + xlnx_clk_gen i_xlnx_clk_gen ( + .clk_out1(clk), // 25 MHz + .clk_out2(phy_tx_clk), // 125 MHz (for RGMII PHY) + .clk_out3(eth_clk), // 125 MHz quadrature (90 deg phase shift) + .clk_out4(sd_clk_sys), // 50 MHz clock + .clk_out5(clk_200MHz_ref), // 200 MHz clock + .reset (cpu_reset), + .locked (pll_locked), + .clk_in1 (ddr_clock_out) // 100MHz input clock + ); `else -xlnx_clk_gen i_xlnx_clk_gen ( - .clk_out1 ( clk ), // 50 MHz - .clk_out2 ( phy_tx_clk ), // 125 MHz (for RGMII PHY) - .clk_out3 ( eth_clk ), // 125 MHz quadrature (90 deg phase shift) - .clk_out4 ( sd_clk_sys ), // 50 MHz clock - .reset ( cpu_reset ), - .locked ( pll_locked ), - .clk_in1 ( ddr_clock_out ) -); -assign clk_200MHz_ref = ddr_clock_out; + xlnx_clk_gen i_xlnx_clk_gen ( + .clk_out1(clk), // 50 MHz + .clk_out2(phy_tx_clk), // 125 MHz (for RGMII PHY) + .clk_out3(eth_clk), // 125 MHz quadrature (90 deg phase shift) + .clk_out4(sd_clk_sys), // 50 MHz clock + .reset (cpu_reset), + .locked (pll_locked), + .clk_in1 (ddr_clock_out) + ); + assign clk_200MHz_ref = ddr_clock_out; `endif `ifdef KINTEX7 -fan_ctrl i_fan_ctrl ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .pwm_setting_i ( '1 ), - .fan_pwm_o ( fan_pwm ) -); + fan_ctrl i_fan_ctrl ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .pwm_setting_i('1), + .fan_pwm_o (fan_pwm) + ); -xlnx_mig_7_ddr3 i_ddr ( - .sys_clk_p, - .sys_clk_n, - .ddr3_dq, - .ddr3_dqs_n, - .ddr3_dqs_p, - .ddr3_addr, - .ddr3_ba, - .ddr3_ras_n, - .ddr3_cas_n, - .ddr3_we_n, - .ddr3_reset_n, - .ddr3_ck_p, - .ddr3_ck_n, - .ddr3_cke, - .ddr3_cs_n, - .ddr3_dm, - .ddr3_odt, - .mmcm_locked ( ), // keep open - .app_sr_req ( '0 ), - .app_ref_req ( '0 ), - .app_zq_req ( '0 ), - .app_sr_active ( ), // keep open - .app_ref_ack ( ), // keep open - .app_zq_ack ( ), // keep open - .ui_clk ( ddr_clock_out ), - .ui_clk_sync_rst ( ddr_sync_reset ), - .aresetn ( ndmreset_n ), - .s_axi_awid, - .s_axi_awaddr ( s_axi_awaddr[29:0] ), - .s_axi_awlen, - .s_axi_awsize, - .s_axi_awburst, - .s_axi_awlock, - .s_axi_awcache, - .s_axi_awprot, - .s_axi_awqos, - .s_axi_awvalid, - .s_axi_awready, - .s_axi_wdata, - .s_axi_wstrb, - .s_axi_wlast, - .s_axi_wvalid, - .s_axi_wready, - .s_axi_bready, - .s_axi_bid, - .s_axi_bresp, - .s_axi_bvalid, - .s_axi_arid, - .s_axi_araddr ( s_axi_araddr[29:0] ), - .s_axi_arlen, - .s_axi_arsize, - .s_axi_arburst, - .s_axi_arlock, - .s_axi_arcache, - .s_axi_arprot, - .s_axi_arqos, - .s_axi_arvalid, - .s_axi_arready, - .s_axi_rready, - .s_axi_rid, - .s_axi_rdata, - .s_axi_rresp, - .s_axi_rlast, - .s_axi_rvalid, - .init_calib_complete ( ), // keep open - .device_temp ( ), // keep open - .sys_rst ( cpu_resetn ) -); + xlnx_mig_7_ddr3 i_ddr ( + .sys_clk_p, + .sys_clk_n, + .ddr3_dq, + .ddr3_dqs_n, + .ddr3_dqs_p, + .ddr3_addr, + .ddr3_ba, + .ddr3_ras_n, + .ddr3_cas_n, + .ddr3_we_n, + .ddr3_reset_n, + .ddr3_ck_p, + .ddr3_ck_n, + .ddr3_cke, + .ddr3_cs_n, + .ddr3_dm, + .ddr3_odt, + .mmcm_locked (), // keep open + .app_sr_req ('0), + .app_ref_req ('0), + .app_zq_req ('0), + .app_sr_active (), // keep open + .app_ref_ack (), // keep open + .app_zq_ack (), // keep open + .ui_clk (ddr_clock_out), + .ui_clk_sync_rst (ddr_sync_reset), + .aresetn (ndmreset_n), + .s_axi_awid, + .s_axi_awaddr (s_axi_awaddr[29:0]), + .s_axi_awlen, + .s_axi_awsize, + .s_axi_awburst, + .s_axi_awlock, + .s_axi_awcache, + .s_axi_awprot, + .s_axi_awqos, + .s_axi_awvalid, + .s_axi_awready, + .s_axi_wdata, + .s_axi_wstrb, + .s_axi_wlast, + .s_axi_wvalid, + .s_axi_wready, + .s_axi_bready, + .s_axi_bid, + .s_axi_bresp, + .s_axi_bvalid, + .s_axi_arid, + .s_axi_araddr (s_axi_araddr[29:0]), + .s_axi_arlen, + .s_axi_arsize, + .s_axi_arburst, + .s_axi_arlock, + .s_axi_arcache, + .s_axi_arprot, + .s_axi_arqos, + .s_axi_arvalid, + .s_axi_arready, + .s_axi_rready, + .s_axi_rid, + .s_axi_rdata, + .s_axi_rresp, + .s_axi_rlast, + .s_axi_rvalid, + .init_calib_complete(), // keep open + .device_temp (), // keep open + .sys_rst (cpu_resetn) + ); `elsif VC707 -fan_ctrl i_fan_ctrl ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .pwm_setting_i ( '1 ), - .fan_pwm_o ( fan_pwm ) -); + fan_ctrl i_fan_ctrl ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .pwm_setting_i('1), + .fan_pwm_o (fan_pwm) + ); -xlnx_mig_7_ddr3 i_ddr ( - .sys_clk_p, - .sys_clk_n, - .ddr3_dq, - .ddr3_dqs_n, - .ddr3_dqs_p, - .ddr3_addr, - .ddr3_ba, - .ddr3_ras_n, - .ddr3_cas_n, - .ddr3_we_n, - .ddr3_reset_n, - .ddr3_ck_p, - .ddr3_ck_n, - .ddr3_cke, - .ddr3_cs_n, - .ddr3_dm, - .ddr3_odt, - .mmcm_locked ( ), // keep open - .app_sr_req ( '0 ), - .app_ref_req ( '0 ), - .app_zq_req ( '0 ), - .app_sr_active ( ), // keep open - .app_ref_ack ( ), // keep open - .app_zq_ack ( ), // keep open - .ui_clk ( ddr_clock_out ), - .ui_clk_sync_rst ( ddr_sync_reset ), - .aresetn ( ndmreset_n ), - .s_axi_awid, - .s_axi_awaddr ( s_axi_awaddr[29:0] ), - .s_axi_awlen, - .s_axi_awsize, - .s_axi_awburst, - .s_axi_awlock, - .s_axi_awcache, - .s_axi_awprot, - .s_axi_awqos, - .s_axi_awvalid, - .s_axi_awready, - .s_axi_wdata, - .s_axi_wstrb, - .s_axi_wlast, - .s_axi_wvalid, - .s_axi_wready, - .s_axi_bready, - .s_axi_bid, - .s_axi_bresp, - .s_axi_bvalid, - .s_axi_arid, - .s_axi_araddr ( s_axi_araddr[29:0] ), - .s_axi_arlen, - .s_axi_arsize, - .s_axi_arburst, - .s_axi_arlock, - .s_axi_arcache, - .s_axi_arprot, - .s_axi_arqos, - .s_axi_arvalid, - .s_axi_arready, - .s_axi_rready, - .s_axi_rid, - .s_axi_rdata, - .s_axi_rresp, - .s_axi_rlast, - .s_axi_rvalid, - .init_calib_complete ( ), // keep open - .device_temp ( ), // keep open - .sys_rst ( cpu_resetn ) -); + xlnx_mig_7_ddr3 i_ddr ( + .sys_clk_p, + .sys_clk_n, + .ddr3_dq, + .ddr3_dqs_n, + .ddr3_dqs_p, + .ddr3_addr, + .ddr3_ba, + .ddr3_ras_n, + .ddr3_cas_n, + .ddr3_we_n, + .ddr3_reset_n, + .ddr3_ck_p, + .ddr3_ck_n, + .ddr3_cke, + .ddr3_cs_n, + .ddr3_dm, + .ddr3_odt, + .mmcm_locked (), // keep open + .app_sr_req ('0), + .app_ref_req ('0), + .app_zq_req ('0), + .app_sr_active (), // keep open + .app_ref_ack (), // keep open + .app_zq_ack (), // keep open + .ui_clk (ddr_clock_out), + .ui_clk_sync_rst (ddr_sync_reset), + .aresetn (ndmreset_n), + .s_axi_awid, + .s_axi_awaddr (s_axi_awaddr[29:0]), + .s_axi_awlen, + .s_axi_awsize, + .s_axi_awburst, + .s_axi_awlock, + .s_axi_awcache, + .s_axi_awprot, + .s_axi_awqos, + .s_axi_awvalid, + .s_axi_awready, + .s_axi_wdata, + .s_axi_wstrb, + .s_axi_wlast, + .s_axi_wvalid, + .s_axi_wready, + .s_axi_bready, + .s_axi_bid, + .s_axi_bresp, + .s_axi_bvalid, + .s_axi_arid, + .s_axi_araddr (s_axi_araddr[29:0]), + .s_axi_arlen, + .s_axi_arsize, + .s_axi_arburst, + .s_axi_arlock, + .s_axi_arcache, + .s_axi_arprot, + .s_axi_arqos, + .s_axi_arvalid, + .s_axi_arready, + .s_axi_rready, + .s_axi_rid, + .s_axi_rdata, + .s_axi_rresp, + .s_axi_rlast, + .s_axi_rvalid, + .init_calib_complete(), // keep open + .device_temp (), // keep open + .sys_rst (cpu_resetn) + ); `elsif NEXYS_VIDEO -fan_ctrl i_fan_ctrl ( - .clk_i ( clk ), - .rst_ni ( ndmreset_n ), - .pwm_setting_i ( '1 ), - .fan_pwm_o ( fan_pwm ) -); + fan_ctrl i_fan_ctrl ( + .clk_i (clk), + .rst_ni (ndmreset_n), + .pwm_setting_i('1), + .fan_pwm_o (fan_pwm) + ); -xlnx_mig_7_ddr3 i_ddr ( - .sys_clk_i ( sys_clk_i ), - .clk_ref_i ( clk_200MHz_ref ), - .ddr3_dq, - .ddr3_dqs_n, - .ddr3_dqs_p, - .ddr3_addr, - .ddr3_ba, - .ddr3_ras_n, - .ddr3_cas_n, - .ddr3_we_n, - .ddr3_reset_n, - .ddr3_ck_p, - .ddr3_ck_n, - .ddr3_cke, - .ddr3_dm, - .ddr3_odt, - .mmcm_locked ( ), // keep open - .app_sr_req ( '0 ), - .app_ref_req ( '0 ), - .app_zq_req ( '0 ), - .app_sr_active ( ), // keep open - .app_ref_ack ( ), // keep open - .app_zq_ack ( ), // keep open - .ui_clk ( ddr_clock_out ), - .ui_clk_sync_rst ( ddr_sync_reset ), - .aresetn ( ndmreset_n ), - .s_axi_awid, - .s_axi_awaddr ( s_axi_awaddr[28:0] ), - .s_axi_awlen, - .s_axi_awsize, - .s_axi_awburst, - .s_axi_awlock, - .s_axi_awcache, - .s_axi_awprot, - .s_axi_awqos, - .s_axi_awvalid, - .s_axi_awready, - .s_axi_wdata, - .s_axi_wstrb, - .s_axi_wlast, - .s_axi_wvalid, - .s_axi_wready, - .s_axi_bready, - .s_axi_bid, - .s_axi_bresp, - .s_axi_bvalid, - .s_axi_arid, - .s_axi_araddr ( s_axi_araddr[28:0] ), - .s_axi_arlen, - .s_axi_arsize, - .s_axi_arburst, - .s_axi_arlock, - .s_axi_arcache, - .s_axi_arprot, - .s_axi_arqos, - .s_axi_arvalid, - .s_axi_arready, - .s_axi_rready, - .s_axi_rid, - .s_axi_rdata, - .s_axi_rresp, - .s_axi_rlast, - .s_axi_rvalid, - .init_calib_complete ( ), // keep open - .device_temp ( ), // keep open - .sys_rst ( cpu_resetn ) -); + xlnx_mig_7_ddr3 i_ddr ( + .sys_clk_i (sys_clk_i), + .clk_ref_i (clk_200MHz_ref), + .ddr3_dq, + .ddr3_dqs_n, + .ddr3_dqs_p, + .ddr3_addr, + .ddr3_ba, + .ddr3_ras_n, + .ddr3_cas_n, + .ddr3_we_n, + .ddr3_reset_n, + .ddr3_ck_p, + .ddr3_ck_n, + .ddr3_cke, + .ddr3_dm, + .ddr3_odt, + .mmcm_locked (), // keep open + .app_sr_req ('0), + .app_ref_req ('0), + .app_zq_req ('0), + .app_sr_active (), // keep open + .app_ref_ack (), // keep open + .app_zq_ack (), // keep open + .ui_clk (ddr_clock_out), + .ui_clk_sync_rst (ddr_sync_reset), + .aresetn (ndmreset_n), + .s_axi_awid, + .s_axi_awaddr (s_axi_awaddr[28:0]), + .s_axi_awlen, + .s_axi_awsize, + .s_axi_awburst, + .s_axi_awlock, + .s_axi_awcache, + .s_axi_awprot, + .s_axi_awqos, + .s_axi_awvalid, + .s_axi_awready, + .s_axi_wdata, + .s_axi_wstrb, + .s_axi_wlast, + .s_axi_wvalid, + .s_axi_wready, + .s_axi_bready, + .s_axi_bid, + .s_axi_bresp, + .s_axi_bvalid, + .s_axi_arid, + .s_axi_araddr (s_axi_araddr[28:0]), + .s_axi_arlen, + .s_axi_arsize, + .s_axi_arburst, + .s_axi_arlock, + .s_axi_arcache, + .s_axi_arprot, + .s_axi_arqos, + .s_axi_arvalid, + .s_axi_arready, + .s_axi_rready, + .s_axi_rid, + .s_axi_rdata, + .s_axi_rresp, + .s_axi_rlast, + .s_axi_rvalid, + .init_calib_complete(), // keep open + .device_temp (), // keep open + .sys_rst (cpu_resetn) + ); `elsif VCU118 - logic [63:0] dram_dwidth_axi_awaddr; - logic [7:0] dram_dwidth_axi_awlen; - logic [2:0] dram_dwidth_axi_awsize; - logic [1:0] dram_dwidth_axi_awburst; - logic [0:0] dram_dwidth_axi_awlock; - logic [3:0] dram_dwidth_axi_awcache; - logic [2:0] dram_dwidth_axi_awprot; - logic [3:0] dram_dwidth_axi_awqos; + logic [ 63:0] dram_dwidth_axi_awaddr; + logic [ 7:0] dram_dwidth_axi_awlen; + logic [ 2:0] dram_dwidth_axi_awsize; + logic [ 1:0] dram_dwidth_axi_awburst; + logic [ 0:0] dram_dwidth_axi_awlock; + logic [ 3:0] dram_dwidth_axi_awcache; + logic [ 2:0] dram_dwidth_axi_awprot; + logic [ 3:0] dram_dwidth_axi_awqos; logic dram_dwidth_axi_awvalid; logic dram_dwidth_axi_awready; logic [511:0] dram_dwidth_axi_wdata; - logic [63:0] dram_dwidth_axi_wstrb; + logic [ 63:0] dram_dwidth_axi_wstrb; logic dram_dwidth_axi_wlast; logic dram_dwidth_axi_wvalid; logic dram_dwidth_axi_wready; logic dram_dwidth_axi_bready; - logic [1:0] dram_dwidth_axi_bresp; + logic [ 1:0] dram_dwidth_axi_bresp; logic dram_dwidth_axi_bvalid; - logic [63:0] dram_dwidth_axi_araddr; - logic [7:0] dram_dwidth_axi_arlen; - logic [2:0] dram_dwidth_axi_arsize; - logic [1:0] dram_dwidth_axi_arburst; - logic [0:0] dram_dwidth_axi_arlock; - logic [3:0] dram_dwidth_axi_arcache; - logic [2:0] dram_dwidth_axi_arprot; - logic [3:0] dram_dwidth_axi_arqos; + logic [ 63:0] dram_dwidth_axi_araddr; + logic [ 7:0] dram_dwidth_axi_arlen; + logic [ 2:0] dram_dwidth_axi_arsize; + logic [ 1:0] dram_dwidth_axi_arburst; + logic [ 0:0] dram_dwidth_axi_arlock; + logic [ 3:0] dram_dwidth_axi_arcache; + logic [ 2:0] dram_dwidth_axi_arprot; + logic [ 3:0] dram_dwidth_axi_arqos; logic dram_dwidth_axi_arvalid; logic dram_dwidth_axi_arready; logic dram_dwidth_axi_rready; logic dram_dwidth_axi_rlast; logic dram_dwidth_axi_rvalid; - logic [1:0] dram_dwidth_axi_rresp; + logic [ 1:0] dram_dwidth_axi_rresp; logic [511:0] dram_dwidth_axi_rdata; -axi_dwidth_converter_512_64 i_axi_dwidth_converter_512_64 ( - .s_axi_aclk ( ddr_clock_out ), - .s_axi_aresetn ( ndmreset_n ), - - .s_axi_awid ( s_axi_awid ), - .s_axi_awaddr ( s_axi_awaddr ), - .s_axi_awlen ( s_axi_awlen ), - .s_axi_awsize ( s_axi_awsize ), - .s_axi_awburst ( s_axi_awburst ), - .s_axi_awlock ( s_axi_awlock ), - .s_axi_awcache ( s_axi_awcache ), - .s_axi_awprot ( s_axi_awprot ), - .s_axi_awregion ( '0 ), - .s_axi_awqos ( s_axi_awqos ), - .s_axi_awvalid ( s_axi_awvalid ), - .s_axi_awready ( s_axi_awready ), - .s_axi_wdata ( s_axi_wdata ), - .s_axi_wstrb ( s_axi_wstrb ), - .s_axi_wlast ( s_axi_wlast ), - .s_axi_wvalid ( s_axi_wvalid ), - .s_axi_wready ( s_axi_wready ), - .s_axi_bid ( s_axi_bid ), - .s_axi_bresp ( s_axi_bresp ), - .s_axi_bvalid ( s_axi_bvalid ), - .s_axi_bready ( s_axi_bready ), - .s_axi_arid ( s_axi_arid ), - .s_axi_araddr ( s_axi_araddr ), - .s_axi_arlen ( s_axi_arlen ), - .s_axi_arsize ( s_axi_arsize ), - .s_axi_arburst ( s_axi_arburst ), - .s_axi_arlock ( s_axi_arlock ), - .s_axi_arcache ( s_axi_arcache ), - .s_axi_arprot ( s_axi_arprot ), - .s_axi_arregion ( '0 ), - .s_axi_arqos ( s_axi_arqos ), - .s_axi_arvalid ( s_axi_arvalid ), - .s_axi_arready ( s_axi_arready ), - .s_axi_rid ( s_axi_rid ), - .s_axi_rdata ( s_axi_rdata ), - .s_axi_rresp ( s_axi_rresp ), - .s_axi_rlast ( s_axi_rlast ), - .s_axi_rvalid ( s_axi_rvalid ), - .s_axi_rready ( s_axi_rready ), - - .m_axi_awaddr ( dram_dwidth_axi_awaddr ), - .m_axi_awlen ( dram_dwidth_axi_awlen ), - .m_axi_awsize ( dram_dwidth_axi_awsize ), - .m_axi_awburst ( dram_dwidth_axi_awburst ), - .m_axi_awlock ( dram_dwidth_axi_awlock ), - .m_axi_awcache ( dram_dwidth_axi_awcache ), - .m_axi_awprot ( dram_dwidth_axi_awprot ), - .m_axi_awregion ( ), // left open - .m_axi_awqos ( dram_dwidth_axi_awqos ), - .m_axi_awvalid ( dram_dwidth_axi_awvalid ), - .m_axi_awready ( dram_dwidth_axi_awready ), - .m_axi_wdata ( dram_dwidth_axi_wdata ), - .m_axi_wstrb ( dram_dwidth_axi_wstrb ), - .m_axi_wlast ( dram_dwidth_axi_wlast ), - .m_axi_wvalid ( dram_dwidth_axi_wvalid ), - .m_axi_wready ( dram_dwidth_axi_wready ), - .m_axi_bresp ( dram_dwidth_axi_bresp ), - .m_axi_bvalid ( dram_dwidth_axi_bvalid ), - .m_axi_bready ( dram_dwidth_axi_bready ), - .m_axi_araddr ( dram_dwidth_axi_araddr ), - .m_axi_arlen ( dram_dwidth_axi_arlen ), - .m_axi_arsize ( dram_dwidth_axi_arsize ), - .m_axi_arburst ( dram_dwidth_axi_arburst ), - .m_axi_arlock ( dram_dwidth_axi_arlock ), - .m_axi_arcache ( dram_dwidth_axi_arcache ), - .m_axi_arprot ( dram_dwidth_axi_arprot ), - .m_axi_arregion ( ), - .m_axi_arqos ( dram_dwidth_axi_arqos ), - .m_axi_arvalid ( dram_dwidth_axi_arvalid ), - .m_axi_arready ( dram_dwidth_axi_arready ), - .m_axi_rdata ( dram_dwidth_axi_rdata ), - .m_axi_rresp ( dram_dwidth_axi_rresp ), - .m_axi_rlast ( dram_dwidth_axi_rlast ), - .m_axi_rvalid ( dram_dwidth_axi_rvalid ), - .m_axi_rready ( dram_dwidth_axi_rready ) -); + axi_dwidth_converter_512_64 i_axi_dwidth_converter_512_64 ( + .s_axi_aclk (ddr_clock_out), + .s_axi_aresetn(ndmreset_n), + + .s_axi_awid (s_axi_awid), + .s_axi_awaddr (s_axi_awaddr), + .s_axi_awlen (s_axi_awlen), + .s_axi_awsize (s_axi_awsize), + .s_axi_awburst (s_axi_awburst), + .s_axi_awlock (s_axi_awlock), + .s_axi_awcache (s_axi_awcache), + .s_axi_awprot (s_axi_awprot), + .s_axi_awregion('0), + .s_axi_awqos (s_axi_awqos), + .s_axi_awvalid (s_axi_awvalid), + .s_axi_awready (s_axi_awready), + .s_axi_wdata (s_axi_wdata), + .s_axi_wstrb (s_axi_wstrb), + .s_axi_wlast (s_axi_wlast), + .s_axi_wvalid (s_axi_wvalid), + .s_axi_wready (s_axi_wready), + .s_axi_bid (s_axi_bid), + .s_axi_bresp (s_axi_bresp), + .s_axi_bvalid (s_axi_bvalid), + .s_axi_bready (s_axi_bready), + .s_axi_arid (s_axi_arid), + .s_axi_araddr (s_axi_araddr), + .s_axi_arlen (s_axi_arlen), + .s_axi_arsize (s_axi_arsize), + .s_axi_arburst (s_axi_arburst), + .s_axi_arlock (s_axi_arlock), + .s_axi_arcache (s_axi_arcache), + .s_axi_arprot (s_axi_arprot), + .s_axi_arregion('0), + .s_axi_arqos (s_axi_arqos), + .s_axi_arvalid (s_axi_arvalid), + .s_axi_arready (s_axi_arready), + .s_axi_rid (s_axi_rid), + .s_axi_rdata (s_axi_rdata), + .s_axi_rresp (s_axi_rresp), + .s_axi_rlast (s_axi_rlast), + .s_axi_rvalid (s_axi_rvalid), + .s_axi_rready (s_axi_rready), + + .m_axi_awaddr (dram_dwidth_axi_awaddr), + .m_axi_awlen (dram_dwidth_axi_awlen), + .m_axi_awsize (dram_dwidth_axi_awsize), + .m_axi_awburst (dram_dwidth_axi_awburst), + .m_axi_awlock (dram_dwidth_axi_awlock), + .m_axi_awcache (dram_dwidth_axi_awcache), + .m_axi_awprot (dram_dwidth_axi_awprot), + .m_axi_awregion(), // left open + .m_axi_awqos (dram_dwidth_axi_awqos), + .m_axi_awvalid (dram_dwidth_axi_awvalid), + .m_axi_awready (dram_dwidth_axi_awready), + .m_axi_wdata (dram_dwidth_axi_wdata), + .m_axi_wstrb (dram_dwidth_axi_wstrb), + .m_axi_wlast (dram_dwidth_axi_wlast), + .m_axi_wvalid (dram_dwidth_axi_wvalid), + .m_axi_wready (dram_dwidth_axi_wready), + .m_axi_bresp (dram_dwidth_axi_bresp), + .m_axi_bvalid (dram_dwidth_axi_bvalid), + .m_axi_bready (dram_dwidth_axi_bready), + .m_axi_araddr (dram_dwidth_axi_araddr), + .m_axi_arlen (dram_dwidth_axi_arlen), + .m_axi_arsize (dram_dwidth_axi_arsize), + .m_axi_arburst (dram_dwidth_axi_arburst), + .m_axi_arlock (dram_dwidth_axi_arlock), + .m_axi_arcache (dram_dwidth_axi_arcache), + .m_axi_arprot (dram_dwidth_axi_arprot), + .m_axi_arregion(), + .m_axi_arqos (dram_dwidth_axi_arqos), + .m_axi_arvalid (dram_dwidth_axi_arvalid), + .m_axi_arready (dram_dwidth_axi_arready), + .m_axi_rdata (dram_dwidth_axi_rdata), + .m_axi_rresp (dram_dwidth_axi_rresp), + .m_axi_rlast (dram_dwidth_axi_rlast), + .m_axi_rvalid (dram_dwidth_axi_rvalid), + .m_axi_rready (dram_dwidth_axi_rready) + ); ddr4_0 i_ddr ( - .c0_init_calib_complete ( ), - .dbg_clk ( ), - .c0_sys_clk_p ( c0_sys_clk_p ), - .c0_sys_clk_n ( c0_sys_clk_n ), - .dbg_bus ( ), - .c0_ddr4_adr ( c0_ddr4_adr ), - .c0_ddr4_ba ( c0_ddr4_ba ), - .c0_ddr4_cke ( c0_ddr4_cke ), - .c0_ddr4_cs_n ( c0_ddr4_cs_n ), - .c0_ddr4_dm_dbi_n ( c0_ddr4_dm_dbi_n ), - .c0_ddr4_dq ( c0_ddr4_dq ), - .c0_ddr4_dqs_c ( c0_ddr4_dqs_c ), - .c0_ddr4_dqs_t ( c0_ddr4_dqs_t ), - .c0_ddr4_odt ( c0_ddr4_odt ), - .c0_ddr4_bg ( c0_ddr4_bg ), - .c0_ddr4_reset_n ( c0_ddr4_reset_n ), - .c0_ddr4_act_n ( c0_ddr4_act_n ), - .c0_ddr4_ck_c ( c0_ddr4_ck_c ), - .c0_ddr4_ck_t ( c0_ddr4_ck_t ), - .c0_ddr4_ui_clk ( ddr_clock_out ), - .c0_ddr4_ui_clk_sync_rst( ddr_sync_reset ), - .c0_ddr4_aresetn ( ndmreset_n ), - .c0_ddr4_s_axi_awid ( '0 ), - .c0_ddr4_s_axi_awaddr ( dram_dwidth_axi_awaddr[30:0] ), - .c0_ddr4_s_axi_awlen ( dram_dwidth_axi_awlen ), - .c0_ddr4_s_axi_awsize ( dram_dwidth_axi_awsize ), - .c0_ddr4_s_axi_awburst ( dram_dwidth_axi_awburst ), - .c0_ddr4_s_axi_awlock ( dram_dwidth_axi_awlock ), - .c0_ddr4_s_axi_awcache ( dram_dwidth_axi_awcache ), - .c0_ddr4_s_axi_awprot ( dram_dwidth_axi_awprot ), - .c0_ddr4_s_axi_awqos ( dram_dwidth_axi_awqos ), - .c0_ddr4_s_axi_awvalid ( dram_dwidth_axi_awvalid ), - .c0_ddr4_s_axi_awready ( dram_dwidth_axi_awready ), - .c0_ddr4_s_axi_wdata ( dram_dwidth_axi_wdata ), - .c0_ddr4_s_axi_wstrb ( dram_dwidth_axi_wstrb ), - .c0_ddr4_s_axi_wlast ( dram_dwidth_axi_wlast ), - .c0_ddr4_s_axi_wvalid ( dram_dwidth_axi_wvalid ), - .c0_ddr4_s_axi_wready ( dram_dwidth_axi_wready ), - .c0_ddr4_s_axi_bready ( dram_dwidth_axi_bready ), - .c0_ddr4_s_axi_bid ( ), - .c0_ddr4_s_axi_bresp ( dram_dwidth_axi_bresp ), - .c0_ddr4_s_axi_bvalid ( dram_dwidth_axi_bvalid ), - .c0_ddr4_s_axi_arid ( '0 ), - .c0_ddr4_s_axi_araddr ( dram_dwidth_axi_araddr[30:0] ), - .c0_ddr4_s_axi_arlen ( dram_dwidth_axi_arlen ), - .c0_ddr4_s_axi_arsize ( dram_dwidth_axi_arsize ), - .c0_ddr4_s_axi_arburst ( dram_dwidth_axi_arburst ), - .c0_ddr4_s_axi_arlock ( dram_dwidth_axi_arlock ), - .c0_ddr4_s_axi_arcache ( dram_dwidth_axi_arcache ), - .c0_ddr4_s_axi_arprot ( dram_dwidth_axi_arprot ), - .c0_ddr4_s_axi_arqos ( dram_dwidth_axi_arqos ), - .c0_ddr4_s_axi_arvalid ( dram_dwidth_axi_arvalid ), - .c0_ddr4_s_axi_arready ( dram_dwidth_axi_arready ), - .c0_ddr4_s_axi_rready ( dram_dwidth_axi_rready ), - .c0_ddr4_s_axi_rlast ( dram_dwidth_axi_rlast ), - .c0_ddr4_s_axi_rvalid ( dram_dwidth_axi_rvalid ), - .c0_ddr4_s_axi_rresp ( dram_dwidth_axi_rresp ), - .c0_ddr4_s_axi_rid ( ), - .c0_ddr4_s_axi_rdata ( dram_dwidth_axi_rdata ), - .sys_rst ( cpu_reset ) + .c0_init_calib_complete (), + .dbg_clk (), + .c0_sys_clk_p (c0_sys_clk_p), + .c0_sys_clk_n (c0_sys_clk_n), + .dbg_bus (), + .c0_ddr4_adr (c0_ddr4_adr), + .c0_ddr4_ba (c0_ddr4_ba), + .c0_ddr4_cke (c0_ddr4_cke), + .c0_ddr4_cs_n (c0_ddr4_cs_n), + .c0_ddr4_dm_dbi_n (c0_ddr4_dm_dbi_n), + .c0_ddr4_dq (c0_ddr4_dq), + .c0_ddr4_dqs_c (c0_ddr4_dqs_c), + .c0_ddr4_dqs_t (c0_ddr4_dqs_t), + .c0_ddr4_odt (c0_ddr4_odt), + .c0_ddr4_bg (c0_ddr4_bg), + .c0_ddr4_reset_n (c0_ddr4_reset_n), + .c0_ddr4_act_n (c0_ddr4_act_n), + .c0_ddr4_ck_c (c0_ddr4_ck_c), + .c0_ddr4_ck_t (c0_ddr4_ck_t), + .c0_ddr4_ui_clk (ddr_clock_out), + .c0_ddr4_ui_clk_sync_rst(ddr_sync_reset), + .c0_ddr4_aresetn (ndmreset_n), + .c0_ddr4_s_axi_awid ('0), + .c0_ddr4_s_axi_awaddr (dram_dwidth_axi_awaddr[30:0]), + .c0_ddr4_s_axi_awlen (dram_dwidth_axi_awlen), + .c0_ddr4_s_axi_awsize (dram_dwidth_axi_awsize), + .c0_ddr4_s_axi_awburst (dram_dwidth_axi_awburst), + .c0_ddr4_s_axi_awlock (dram_dwidth_axi_awlock), + .c0_ddr4_s_axi_awcache (dram_dwidth_axi_awcache), + .c0_ddr4_s_axi_awprot (dram_dwidth_axi_awprot), + .c0_ddr4_s_axi_awqos (dram_dwidth_axi_awqos), + .c0_ddr4_s_axi_awvalid (dram_dwidth_axi_awvalid), + .c0_ddr4_s_axi_awready (dram_dwidth_axi_awready), + .c0_ddr4_s_axi_wdata (dram_dwidth_axi_wdata), + .c0_ddr4_s_axi_wstrb (dram_dwidth_axi_wstrb), + .c0_ddr4_s_axi_wlast (dram_dwidth_axi_wlast), + .c0_ddr4_s_axi_wvalid (dram_dwidth_axi_wvalid), + .c0_ddr4_s_axi_wready (dram_dwidth_axi_wready), + .c0_ddr4_s_axi_bready (dram_dwidth_axi_bready), + .c0_ddr4_s_axi_bid (), + .c0_ddr4_s_axi_bresp (dram_dwidth_axi_bresp), + .c0_ddr4_s_axi_bvalid (dram_dwidth_axi_bvalid), + .c0_ddr4_s_axi_arid ('0), + .c0_ddr4_s_axi_araddr (dram_dwidth_axi_araddr[30:0]), + .c0_ddr4_s_axi_arlen (dram_dwidth_axi_arlen), + .c0_ddr4_s_axi_arsize (dram_dwidth_axi_arsize), + .c0_ddr4_s_axi_arburst (dram_dwidth_axi_arburst), + .c0_ddr4_s_axi_arlock (dram_dwidth_axi_arlock), + .c0_ddr4_s_axi_arcache (dram_dwidth_axi_arcache), + .c0_ddr4_s_axi_arprot (dram_dwidth_axi_arprot), + .c0_ddr4_s_axi_arqos (dram_dwidth_axi_arqos), + .c0_ddr4_s_axi_arvalid (dram_dwidth_axi_arvalid), + .c0_ddr4_s_axi_arready (dram_dwidth_axi_arready), + .c0_ddr4_s_axi_rready (dram_dwidth_axi_rready), + .c0_ddr4_s_axi_rlast (dram_dwidth_axi_rlast), + .c0_ddr4_s_axi_rvalid (dram_dwidth_axi_rvalid), + .c0_ddr4_s_axi_rresp (dram_dwidth_axi_rresp), + .c0_ddr4_s_axi_rid (), + .c0_ddr4_s_axi_rdata (dram_dwidth_axi_rdata), + .sys_rst (cpu_reset) ); - logic pcie_ref_clk; - logic pcie_ref_clk_gt; + logic pcie_ref_clk; + logic pcie_ref_clk_gt; - logic pcie_axi_clk; - logic pcie_axi_rstn; + logic pcie_axi_clk; + logic pcie_axi_rstn; logic pcie_axi_awready; logic pcie_axi_wready; - logic [3:0] pcie_axi_bid; - logic [1:0] pcie_axi_bresp; + logic [ 3:0] pcie_axi_bid; + logic [ 1:0] pcie_axi_bresp; logic pcie_axi_bvalid; logic pcie_axi_arready; - logic [3:0] pcie_axi_rid; + logic [ 3:0] pcie_axi_rid; logic [255:0] pcie_axi_rdata; - logic [1:0] pcie_axi_rresp; + logic [ 1:0] pcie_axi_rresp; logic pcie_axi_rlast; logic pcie_axi_rvalid; - logic [3:0] pcie_axi_awid; - logic [63:0] pcie_axi_awaddr; - logic [7:0] pcie_axi_awlen; - logic [2:0] pcie_axi_awsize; - logic [1:0] pcie_axi_awburst; - logic [2:0] pcie_axi_awprot; + logic [ 3:0] pcie_axi_awid; + logic [ 63:0] pcie_axi_awaddr; + logic [ 7:0] pcie_axi_awlen; + logic [ 2:0] pcie_axi_awsize; + logic [ 1:0] pcie_axi_awburst; + logic [ 2:0] pcie_axi_awprot; logic pcie_axi_awvalid; logic pcie_axi_awlock; - logic [3:0] pcie_axi_awcache; + logic [ 3:0] pcie_axi_awcache; logic [255:0] pcie_axi_wdata; - logic [31:0] pcie_axi_wstrb; + logic [ 31:0] pcie_axi_wstrb; logic pcie_axi_wlast; logic pcie_axi_wvalid; logic pcie_axi_bready; - logic [3:0] pcie_axi_arid; - logic [63:0] pcie_axi_araddr; - logic [7:0] pcie_axi_arlen; - logic [2:0] pcie_axi_arsize; - logic [1:0] pcie_axi_arburst; - logic [2:0] pcie_axi_arprot; + logic [ 3:0] pcie_axi_arid; + logic [ 63:0] pcie_axi_araddr; + logic [ 7:0] pcie_axi_arlen; + logic [ 2:0] pcie_axi_arsize; + logic [ 1:0] pcie_axi_arburst; + logic [ 2:0] pcie_axi_arprot; logic pcie_axi_arvalid; logic pcie_axi_arlock; - logic [3:0] pcie_axi_arcache; + logic [ 3:0] pcie_axi_arcache; logic pcie_axi_rready; - logic [63:0] pcie_dwidth_axi_awaddr; - logic [7:0] pcie_dwidth_axi_awlen; - logic [2:0] pcie_dwidth_axi_awsize; - logic [1:0] pcie_dwidth_axi_awburst; - logic [0:0] pcie_dwidth_axi_awlock; - logic [3:0] pcie_dwidth_axi_awcache; - logic [2:0] pcie_dwidth_axi_awprot; - logic [3:0] pcie_dwidth_axi_awregion; - logic [3:0] pcie_dwidth_axi_awqos; + logic [ 63:0] pcie_dwidth_axi_awaddr; + logic [ 7:0] pcie_dwidth_axi_awlen; + logic [ 2:0] pcie_dwidth_axi_awsize; + logic [ 1:0] pcie_dwidth_axi_awburst; + logic [ 0:0] pcie_dwidth_axi_awlock; + logic [ 3:0] pcie_dwidth_axi_awcache; + logic [ 2:0] pcie_dwidth_axi_awprot; + logic [ 3:0] pcie_dwidth_axi_awregion; + logic [ 3:0] pcie_dwidth_axi_awqos; logic pcie_dwidth_axi_awvalid; logic pcie_dwidth_axi_awready; - logic [63:0] pcie_dwidth_axi_wdata; - logic [7:0] pcie_dwidth_axi_wstrb; + logic [ 63:0] pcie_dwidth_axi_wdata; + logic [ 7:0] pcie_dwidth_axi_wstrb; logic pcie_dwidth_axi_wlast; logic pcie_dwidth_axi_wvalid; logic pcie_dwidth_axi_wready; - logic [1:0] pcie_dwidth_axi_bresp; + logic [ 1:0] pcie_dwidth_axi_bresp; logic pcie_dwidth_axi_bvalid; logic pcie_dwidth_axi_bready; - logic [63:0] pcie_dwidth_axi_araddr; - logic [7:0] pcie_dwidth_axi_arlen; - logic [2:0] pcie_dwidth_axi_arsize; - logic [1:0] pcie_dwidth_axi_arburst; - logic [0:0] pcie_dwidth_axi_arlock; - logic [3:0] pcie_dwidth_axi_arcache; - logic [2:0] pcie_dwidth_axi_arprot; - logic [3:0] pcie_dwidth_axi_arregion; - logic [3:0] pcie_dwidth_axi_arqos; + logic [ 63:0] pcie_dwidth_axi_araddr; + logic [ 7:0] pcie_dwidth_axi_arlen; + logic [ 2:0] pcie_dwidth_axi_arsize; + logic [ 1:0] pcie_dwidth_axi_arburst; + logic [ 0:0] pcie_dwidth_axi_arlock; + logic [ 3:0] pcie_dwidth_axi_arcache; + logic [ 2:0] pcie_dwidth_axi_arprot; + logic [ 3:0] pcie_dwidth_axi_arregion; + logic [ 3:0] pcie_dwidth_axi_arqos; logic pcie_dwidth_axi_arvalid; logic pcie_dwidth_axi_arready; - logic [63:0] pcie_dwidth_axi_rdata; - logic [1:0] pcie_dwidth_axi_rresp; + logic [ 63:0] pcie_dwidth_axi_rdata; + logic [ 1:0] pcie_dwidth_axi_rresp; logic pcie_dwidth_axi_rlast; logic pcie_dwidth_axi_rvalid; logic pcie_dwidth_axi_rready; // PCIe Reset - logic sys_rst_n_c; - IBUF sys_reset_n_ibuf (.O(sys_rst_n_c), .I(sys_rst_n)); + logic sys_rst_n_c; + IBUF sys_reset_n_ibuf ( + .O(sys_rst_n_c), + .I(sys_rst_n) + ); IBUFDS_GTE4 #( - .REFCLK_HROW_CK_SEL ( 2'b00 ) + .REFCLK_HROW_CK_SEL(2'b00) ) IBUFDS_GTE4_inst ( - .O ( pcie_ref_clk_gt ), - .ODIV2 ( pcie_ref_clk ), - .CEB ( 1'b0 ), - .I ( sys_clk_p ), - .IB ( sys_clk_n ) + .O (pcie_ref_clk_gt), + .ODIV2(pcie_ref_clk), + .CEB (1'b0), + .I (sys_clk_p), + .IB (sys_clk_n) ); // 250 MHz AXI xdma_0 i_xdma ( - .sys_clk ( pcie_ref_clk ), - .sys_clk_gt ( pcie_ref_clk_gt ), - .sys_rst_n ( sys_rst_n_c ), - .user_lnk_up ( ), - - // Tx - .pci_exp_txp ( pci_exp_txp ), - .pci_exp_txn ( pci_exp_txn ), - // Rx - .pci_exp_rxp ( pci_exp_rxp ), - .pci_exp_rxn ( pci_exp_rxn ), - .usr_irq_req ( 1'b0 ), - .usr_irq_ack ( ), - .msi_enable ( ), - .msi_vector_width ( ), - .axi_aclk ( pcie_axi_clk ), - .axi_aresetn ( pcie_axi_rstn ), - .m_axi_awready ( pcie_axi_awready ), - .m_axi_wready ( pcie_axi_wready ), - .m_axi_bid ( pcie_axi_bid ), - .m_axi_bresp ( pcie_axi_bresp ), - .m_axi_bvalid ( pcie_axi_bvalid ), - .m_axi_arready ( pcie_axi_arready ), - .m_axi_rid ( pcie_axi_rid ), - .m_axi_rdata ( pcie_axi_rdata ), - .m_axi_rresp ( pcie_axi_rresp ), - .m_axi_rlast ( pcie_axi_rlast ), - .m_axi_rvalid ( pcie_axi_rvalid ), - .m_axi_awid ( pcie_axi_awid ), - .m_axi_awaddr ( pcie_axi_awaddr ), - .m_axi_awlen ( pcie_axi_awlen ), - .m_axi_awsize ( pcie_axi_awsize ), - .m_axi_awburst ( pcie_axi_awburst ), - .m_axi_awprot ( pcie_axi_awprot ), - .m_axi_awvalid ( pcie_axi_awvalid ), - .m_axi_awlock ( pcie_axi_awlock ), - .m_axi_awcache ( pcie_axi_awcache ), - .m_axi_wdata ( pcie_axi_wdata ), - .m_axi_wstrb ( pcie_axi_wstrb ), - .m_axi_wlast ( pcie_axi_wlast ), - .m_axi_wvalid ( pcie_axi_wvalid ), - .m_axi_bready ( pcie_axi_bready ), - .m_axi_arid ( pcie_axi_arid ), - .m_axi_araddr ( pcie_axi_araddr ), - .m_axi_arlen ( pcie_axi_arlen ), - .m_axi_arsize ( pcie_axi_arsize ), - .m_axi_arburst ( pcie_axi_arburst ), - .m_axi_arprot ( pcie_axi_arprot ), - .m_axi_arvalid ( pcie_axi_arvalid ), - .m_axi_arlock ( pcie_axi_arlock ), - .m_axi_arcache ( pcie_axi_arcache ), - .m_axi_rready ( pcie_axi_rready ), - - .cfg_mgmt_addr ( '0 ), - .cfg_mgmt_write ( '0 ), - .cfg_mgmt_write_data ( '0 ), - .cfg_mgmt_byte_enable ( '0 ), - .cfg_mgmt_read ( '0 ), - .cfg_mgmt_read_data ( ), - .cfg_mgmt_read_write_done ( ) + .sys_clk (pcie_ref_clk), + .sys_clk_gt (pcie_ref_clk_gt), + .sys_rst_n (sys_rst_n_c), + .user_lnk_up(), + + // Tx + .pci_exp_txp (pci_exp_txp), + .pci_exp_txn (pci_exp_txn), + // Rx + .pci_exp_rxp (pci_exp_rxp), + .pci_exp_rxn (pci_exp_rxn), + .usr_irq_req (1'b0), + .usr_irq_ack (), + .msi_enable (), + .msi_vector_width(), + .axi_aclk (pcie_axi_clk), + .axi_aresetn (pcie_axi_rstn), + .m_axi_awready (pcie_axi_awready), + .m_axi_wready (pcie_axi_wready), + .m_axi_bid (pcie_axi_bid), + .m_axi_bresp (pcie_axi_bresp), + .m_axi_bvalid (pcie_axi_bvalid), + .m_axi_arready (pcie_axi_arready), + .m_axi_rid (pcie_axi_rid), + .m_axi_rdata (pcie_axi_rdata), + .m_axi_rresp (pcie_axi_rresp), + .m_axi_rlast (pcie_axi_rlast), + .m_axi_rvalid (pcie_axi_rvalid), + .m_axi_awid (pcie_axi_awid), + .m_axi_awaddr (pcie_axi_awaddr), + .m_axi_awlen (pcie_axi_awlen), + .m_axi_awsize (pcie_axi_awsize), + .m_axi_awburst (pcie_axi_awburst), + .m_axi_awprot (pcie_axi_awprot), + .m_axi_awvalid (pcie_axi_awvalid), + .m_axi_awlock (pcie_axi_awlock), + .m_axi_awcache (pcie_axi_awcache), + .m_axi_wdata (pcie_axi_wdata), + .m_axi_wstrb (pcie_axi_wstrb), + .m_axi_wlast (pcie_axi_wlast), + .m_axi_wvalid (pcie_axi_wvalid), + .m_axi_bready (pcie_axi_bready), + .m_axi_arid (pcie_axi_arid), + .m_axi_araddr (pcie_axi_araddr), + .m_axi_arlen (pcie_axi_arlen), + .m_axi_arsize (pcie_axi_arsize), + .m_axi_arburst (pcie_axi_arburst), + .m_axi_arprot (pcie_axi_arprot), + .m_axi_arvalid (pcie_axi_arvalid), + .m_axi_arlock (pcie_axi_arlock), + .m_axi_arcache (pcie_axi_arcache), + .m_axi_rready (pcie_axi_rready), + + .cfg_mgmt_addr ('0), + .cfg_mgmt_write ('0), + .cfg_mgmt_write_data ('0), + .cfg_mgmt_byte_enable ('0), + .cfg_mgmt_read ('0), + .cfg_mgmt_read_data (), + .cfg_mgmt_read_write_done() ); axi_dwidth_converter_256_64 i_axi_dwidth_converter_256_64 ( - .s_axi_aclk ( pcie_axi_clk ), - .s_axi_aresetn ( pcie_axi_rstn ), - .s_axi_awid ( pcie_axi_awid ), - .s_axi_awaddr ( pcie_axi_awaddr ), - .s_axi_awlen ( pcie_axi_awlen ), - .s_axi_awsize ( pcie_axi_awsize ), - .s_axi_awburst ( pcie_axi_awburst ), - .s_axi_awlock ( pcie_axi_awlock ), - .s_axi_awcache ( pcie_axi_awcache ), - .s_axi_awprot ( pcie_axi_awprot ), - .s_axi_awregion ( '0 ), - .s_axi_awqos ( '0 ), - .s_axi_awvalid ( pcie_axi_awvalid ), - .s_axi_awready ( pcie_axi_awready ), - .s_axi_wdata ( pcie_axi_wdata ), - .s_axi_wstrb ( pcie_axi_wstrb ), - .s_axi_wlast ( pcie_axi_wlast ), - .s_axi_wvalid ( pcie_axi_wvalid ), - .s_axi_wready ( pcie_axi_wready ), - .s_axi_bid ( pcie_axi_bid ), - .s_axi_bresp ( pcie_axi_rresp ), - .s_axi_bvalid ( pcie_axi_bvalid ), - .s_axi_bready ( pcie_axi_bready ), - .s_axi_arid ( pcie_axi_arid ), - .s_axi_araddr ( pcie_axi_araddr ), - .s_axi_arlen ( pcie_axi_arlen ), - .s_axi_arsize ( pcie_axi_arsize ), - .s_axi_arburst ( pcie_axi_arburst ), - .s_axi_arlock ( pcie_axi_arlock ), - .s_axi_arcache ( pcie_axi_arcache ), - .s_axi_arprot ( pcie_axi_arprot ), - .s_axi_arregion ( '0 ), - .s_axi_arqos ( '0 ), - .s_axi_arvalid ( pcie_axi_arvalid ), - .s_axi_arready ( pcie_axi_arready ), - .s_axi_rid ( pcie_axi_rid ), - .s_axi_rdata ( pcie_axi_rdata ), - .s_axi_rresp ( pcie_axi_bresp ), - .s_axi_rlast ( pcie_axi_rlast ), - .s_axi_rvalid ( pcie_axi_rvalid ), - .s_axi_rready ( pcie_axi_rready ), - - .m_axi_awaddr ( pcie_dwidth_axi_awaddr ), - .m_axi_awlen ( pcie_dwidth_axi_awlen ), - .m_axi_awsize ( pcie_dwidth_axi_awsize ), - .m_axi_awburst ( pcie_dwidth_axi_awburst ), - .m_axi_awlock ( pcie_dwidth_axi_awlock ), - .m_axi_awcache ( pcie_dwidth_axi_awcache ), - .m_axi_awprot ( pcie_dwidth_axi_awprot ), - .m_axi_awregion ( pcie_dwidth_axi_awregion ), - .m_axi_awqos ( pcie_dwidth_axi_awqos ), - .m_axi_awvalid ( pcie_dwidth_axi_awvalid ), - .m_axi_awready ( pcie_dwidth_axi_awready ), - .m_axi_wdata ( pcie_dwidth_axi_wdata ), - .m_axi_wstrb ( pcie_dwidth_axi_wstrb ), - .m_axi_wlast ( pcie_dwidth_axi_wlast ), - .m_axi_wvalid ( pcie_dwidth_axi_wvalid ), - .m_axi_wready ( pcie_dwidth_axi_wready ), - .m_axi_bresp ( pcie_dwidth_axi_bresp ), - .m_axi_bvalid ( pcie_dwidth_axi_bvalid ), - .m_axi_bready ( pcie_dwidth_axi_bready ), - .m_axi_araddr ( pcie_dwidth_axi_araddr ), - .m_axi_arlen ( pcie_dwidth_axi_arlen ), - .m_axi_arsize ( pcie_dwidth_axi_arsize ), - .m_axi_arburst ( pcie_dwidth_axi_arburst ), - .m_axi_arlock ( pcie_dwidth_axi_arlock ), - .m_axi_arcache ( pcie_dwidth_axi_arcache ), - .m_axi_arprot ( pcie_dwidth_axi_arprot ), - .m_axi_arregion ( pcie_dwidth_axi_arregion ), - .m_axi_arqos ( pcie_dwidth_axi_arqos ), - .m_axi_arvalid ( pcie_dwidth_axi_arvalid ), - .m_axi_arready ( pcie_dwidth_axi_arready ), - .m_axi_rdata ( pcie_dwidth_axi_rdata ), - .m_axi_rresp ( pcie_dwidth_axi_rresp ), - .m_axi_rlast ( pcie_dwidth_axi_rlast ), - .m_axi_rvalid ( pcie_dwidth_axi_rvalid ), - .m_axi_rready ( pcie_dwidth_axi_rready ) + .s_axi_aclk (pcie_axi_clk), + .s_axi_aresetn (pcie_axi_rstn), + .s_axi_awid (pcie_axi_awid), + .s_axi_awaddr (pcie_axi_awaddr), + .s_axi_awlen (pcie_axi_awlen), + .s_axi_awsize (pcie_axi_awsize), + .s_axi_awburst (pcie_axi_awburst), + .s_axi_awlock (pcie_axi_awlock), + .s_axi_awcache (pcie_axi_awcache), + .s_axi_awprot (pcie_axi_awprot), + .s_axi_awregion('0), + .s_axi_awqos ('0), + .s_axi_awvalid (pcie_axi_awvalid), + .s_axi_awready (pcie_axi_awready), + .s_axi_wdata (pcie_axi_wdata), + .s_axi_wstrb (pcie_axi_wstrb), + .s_axi_wlast (pcie_axi_wlast), + .s_axi_wvalid (pcie_axi_wvalid), + .s_axi_wready (pcie_axi_wready), + .s_axi_bid (pcie_axi_bid), + .s_axi_bresp (pcie_axi_rresp), + .s_axi_bvalid (pcie_axi_bvalid), + .s_axi_bready (pcie_axi_bready), + .s_axi_arid (pcie_axi_arid), + .s_axi_araddr (pcie_axi_araddr), + .s_axi_arlen (pcie_axi_arlen), + .s_axi_arsize (pcie_axi_arsize), + .s_axi_arburst (pcie_axi_arburst), + .s_axi_arlock (pcie_axi_arlock), + .s_axi_arcache (pcie_axi_arcache), + .s_axi_arprot (pcie_axi_arprot), + .s_axi_arregion('0), + .s_axi_arqos ('0), + .s_axi_arvalid (pcie_axi_arvalid), + .s_axi_arready (pcie_axi_arready), + .s_axi_rid (pcie_axi_rid), + .s_axi_rdata (pcie_axi_rdata), + .s_axi_rresp (pcie_axi_bresp), + .s_axi_rlast (pcie_axi_rlast), + .s_axi_rvalid (pcie_axi_rvalid), + .s_axi_rready (pcie_axi_rready), + + .m_axi_awaddr (pcie_dwidth_axi_awaddr), + .m_axi_awlen (pcie_dwidth_axi_awlen), + .m_axi_awsize (pcie_dwidth_axi_awsize), + .m_axi_awburst (pcie_dwidth_axi_awburst), + .m_axi_awlock (pcie_dwidth_axi_awlock), + .m_axi_awcache (pcie_dwidth_axi_awcache), + .m_axi_awprot (pcie_dwidth_axi_awprot), + .m_axi_awregion(pcie_dwidth_axi_awregion), + .m_axi_awqos (pcie_dwidth_axi_awqos), + .m_axi_awvalid (pcie_dwidth_axi_awvalid), + .m_axi_awready (pcie_dwidth_axi_awready), + .m_axi_wdata (pcie_dwidth_axi_wdata), + .m_axi_wstrb (pcie_dwidth_axi_wstrb), + .m_axi_wlast (pcie_dwidth_axi_wlast), + .m_axi_wvalid (pcie_dwidth_axi_wvalid), + .m_axi_wready (pcie_dwidth_axi_wready), + .m_axi_bresp (pcie_dwidth_axi_bresp), + .m_axi_bvalid (pcie_dwidth_axi_bvalid), + .m_axi_bready (pcie_dwidth_axi_bready), + .m_axi_araddr (pcie_dwidth_axi_araddr), + .m_axi_arlen (pcie_dwidth_axi_arlen), + .m_axi_arsize (pcie_dwidth_axi_arsize), + .m_axi_arburst (pcie_dwidth_axi_arburst), + .m_axi_arlock (pcie_dwidth_axi_arlock), + .m_axi_arcache (pcie_dwidth_axi_arcache), + .m_axi_arprot (pcie_dwidth_axi_arprot), + .m_axi_arregion(pcie_dwidth_axi_arregion), + .m_axi_arqos (pcie_dwidth_axi_arqos), + .m_axi_arvalid (pcie_dwidth_axi_arvalid), + .m_axi_arready (pcie_dwidth_axi_arready), + .m_axi_rdata (pcie_dwidth_axi_rdata), + .m_axi_rresp (pcie_dwidth_axi_rresp), + .m_axi_rlast (pcie_dwidth_axi_rlast), + .m_axi_rvalid (pcie_dwidth_axi_rvalid), + .m_axi_rready (pcie_dwidth_axi_rready) ); -assign slave[1].aw_user = '0; -assign slave[1].ar_user = '0; -assign slave[1].w_user = '0; - -logic [3:0] slave_b_id; -logic [3:0] slave_r_id; - -assign slave[1].b_id = slave_b_id[1:0]; -assign slave[1].r_id = slave_r_id[1:0]; - -// PCIe Clock Converter -axi_clock_converter_0 pcie_axi_clock_converter ( - .m_axi_aclk ( clk ), - .m_axi_aresetn ( ndmreset_n ), - .m_axi_awid ( {2'b0, slave[1].aw_id} ), - .m_axi_awaddr ( slave[1].aw_addr ), - .m_axi_awlen ( slave[1].aw_len ), - .m_axi_awsize ( slave[1].aw_size ), - .m_axi_awburst ( slave[1].aw_burst ), - .m_axi_awlock ( slave[1].aw_lock ), - .m_axi_awcache ( slave[1].aw_cache ), - .m_axi_awprot ( slave[1].aw_prot ), - .m_axi_awregion ( slave[1].aw_region ), - .m_axi_awqos ( slave[1].aw_qos ), - .m_axi_awvalid ( slave[1].aw_valid ), - .m_axi_awready ( slave[1].aw_ready ), - .m_axi_wdata ( slave[1].w_data ), - .m_axi_wstrb ( slave[1].w_strb ), - .m_axi_wlast ( slave[1].w_last ), - .m_axi_wvalid ( slave[1].w_valid ), - .m_axi_wready ( slave[1].w_ready ), - .m_axi_bid ( slave_b_id ), - .m_axi_bresp ( slave[1].b_resp ), - .m_axi_bvalid ( slave[1].b_valid ), - .m_axi_bready ( slave[1].b_ready ), - .m_axi_arid ( {2'b0, slave[1].ar_id} ), - .m_axi_araddr ( slave[1].ar_addr ), - .m_axi_arlen ( slave[1].ar_len ), - .m_axi_arsize ( slave[1].ar_size ), - .m_axi_arburst ( slave[1].ar_burst ), - .m_axi_arlock ( slave[1].ar_lock ), - .m_axi_arcache ( slave[1].ar_cache ), - .m_axi_arprot ( slave[1].ar_prot ), - .m_axi_arregion ( slave[1].ar_region ), - .m_axi_arqos ( slave[1].ar_qos ), - .m_axi_arvalid ( slave[1].ar_valid ), - .m_axi_arready ( slave[1].ar_ready ), - .m_axi_rid ( slave_r_id ), - .m_axi_rdata ( slave[1].r_data ), - .m_axi_rresp ( slave[1].r_resp ), - .m_axi_rlast ( slave[1].r_last ), - .m_axi_rvalid ( slave[1].r_valid ), - .m_axi_rready ( slave[1].r_ready ), - // from size converter - .s_axi_aclk ( pcie_axi_clk ), - .s_axi_aresetn ( ndmreset_n ), - .s_axi_awid ( '0 ), - .s_axi_awaddr ( pcie_dwidth_axi_awaddr ), - .s_axi_awlen ( pcie_dwidth_axi_awlen ), - .s_axi_awsize ( pcie_dwidth_axi_awsize ), - .s_axi_awburst ( pcie_dwidth_axi_awburst ), - .s_axi_awlock ( pcie_dwidth_axi_awlock ), - .s_axi_awcache ( pcie_dwidth_axi_awcache ), - .s_axi_awprot ( pcie_dwidth_axi_awprot ), - .s_axi_awregion ( pcie_dwidth_axi_awregion ), - .s_axi_awqos ( pcie_dwidth_axi_awqos ), - .s_axi_awvalid ( pcie_dwidth_axi_awvalid ), - .s_axi_awready ( pcie_dwidth_axi_awready ), - .s_axi_wdata ( pcie_dwidth_axi_wdata ), - .s_axi_wstrb ( pcie_dwidth_axi_wstrb ), - .s_axi_wlast ( pcie_dwidth_axi_wlast ), - .s_axi_wvalid ( pcie_dwidth_axi_wvalid ), - .s_axi_wready ( pcie_dwidth_axi_wready ), - .s_axi_bid ( ), - .s_axi_bresp ( pcie_dwidth_axi_bresp ), - .s_axi_bvalid ( pcie_dwidth_axi_bvalid ), - .s_axi_bready ( pcie_dwidth_axi_bready ), - .s_axi_arid ( '0 ), - .s_axi_araddr ( pcie_dwidth_axi_araddr ), - .s_axi_arlen ( pcie_dwidth_axi_arlen ), - .s_axi_arsize ( pcie_dwidth_axi_arsize ), - .s_axi_arburst ( pcie_dwidth_axi_arburst ), - .s_axi_arlock ( pcie_dwidth_axi_arlock ), - .s_axi_arcache ( pcie_dwidth_axi_arcache ), - .s_axi_arprot ( pcie_dwidth_axi_arprot ), - .s_axi_arregion ( pcie_dwidth_axi_arregion ), - .s_axi_arqos ( pcie_dwidth_axi_arqos ), - .s_axi_arvalid ( pcie_dwidth_axi_arvalid ), - .s_axi_arready ( pcie_dwidth_axi_arready ), - .s_axi_rid ( ), - .s_axi_rdata ( pcie_dwidth_axi_rdata ), - .s_axi_rresp ( pcie_dwidth_axi_rresp ), - .s_axi_rlast ( pcie_dwidth_axi_rlast ), - .s_axi_rvalid ( pcie_dwidth_axi_rvalid ), - .s_axi_rready ( pcie_dwidth_axi_rready ) -); + assign slave[1].aw_user = '0; + assign slave[1].ar_user = '0; + assign slave[1].w_user = '0; + + logic [3:0] slave_b_id; + logic [3:0] slave_r_id; + + assign slave[1].b_id = slave_b_id[1:0]; + assign slave[1].r_id = slave_r_id[1:0]; + + // PCIe Clock Converter + axi_clock_converter_0 pcie_axi_clock_converter ( + .m_axi_aclk (clk), + .m_axi_aresetn (ndmreset_n), + .m_axi_awid ({2'b0, slave[1].aw_id}), + .m_axi_awaddr (slave[1].aw_addr), + .m_axi_awlen (slave[1].aw_len), + .m_axi_awsize (slave[1].aw_size), + .m_axi_awburst (slave[1].aw_burst), + .m_axi_awlock (slave[1].aw_lock), + .m_axi_awcache (slave[1].aw_cache), + .m_axi_awprot (slave[1].aw_prot), + .m_axi_awregion(slave[1].aw_region), + .m_axi_awqos (slave[1].aw_qos), + .m_axi_awvalid (slave[1].aw_valid), + .m_axi_awready (slave[1].aw_ready), + .m_axi_wdata (slave[1].w_data), + .m_axi_wstrb (slave[1].w_strb), + .m_axi_wlast (slave[1].w_last), + .m_axi_wvalid (slave[1].w_valid), + .m_axi_wready (slave[1].w_ready), + .m_axi_bid (slave_b_id), + .m_axi_bresp (slave[1].b_resp), + .m_axi_bvalid (slave[1].b_valid), + .m_axi_bready (slave[1].b_ready), + .m_axi_arid ({2'b0, slave[1].ar_id}), + .m_axi_araddr (slave[1].ar_addr), + .m_axi_arlen (slave[1].ar_len), + .m_axi_arsize (slave[1].ar_size), + .m_axi_arburst (slave[1].ar_burst), + .m_axi_arlock (slave[1].ar_lock), + .m_axi_arcache (slave[1].ar_cache), + .m_axi_arprot (slave[1].ar_prot), + .m_axi_arregion(slave[1].ar_region), + .m_axi_arqos (slave[1].ar_qos), + .m_axi_arvalid (slave[1].ar_valid), + .m_axi_arready (slave[1].ar_ready), + .m_axi_rid (slave_r_id), + .m_axi_rdata (slave[1].r_data), + .m_axi_rresp (slave[1].r_resp), + .m_axi_rlast (slave[1].r_last), + .m_axi_rvalid (slave[1].r_valid), + .m_axi_rready (slave[1].r_ready), + // from size converter + .s_axi_aclk (pcie_axi_clk), + .s_axi_aresetn (ndmreset_n), + .s_axi_awid ('0), + .s_axi_awaddr (pcie_dwidth_axi_awaddr), + .s_axi_awlen (pcie_dwidth_axi_awlen), + .s_axi_awsize (pcie_dwidth_axi_awsize), + .s_axi_awburst (pcie_dwidth_axi_awburst), + .s_axi_awlock (pcie_dwidth_axi_awlock), + .s_axi_awcache (pcie_dwidth_axi_awcache), + .s_axi_awprot (pcie_dwidth_axi_awprot), + .s_axi_awregion(pcie_dwidth_axi_awregion), + .s_axi_awqos (pcie_dwidth_axi_awqos), + .s_axi_awvalid (pcie_dwidth_axi_awvalid), + .s_axi_awready (pcie_dwidth_axi_awready), + .s_axi_wdata (pcie_dwidth_axi_wdata), + .s_axi_wstrb (pcie_dwidth_axi_wstrb), + .s_axi_wlast (pcie_dwidth_axi_wlast), + .s_axi_wvalid (pcie_dwidth_axi_wvalid), + .s_axi_wready (pcie_dwidth_axi_wready), + .s_axi_bid (), + .s_axi_bresp (pcie_dwidth_axi_bresp), + .s_axi_bvalid (pcie_dwidth_axi_bvalid), + .s_axi_bready (pcie_dwidth_axi_bready), + .s_axi_arid ('0), + .s_axi_araddr (pcie_dwidth_axi_araddr), + .s_axi_arlen (pcie_dwidth_axi_arlen), + .s_axi_arsize (pcie_dwidth_axi_arsize), + .s_axi_arburst (pcie_dwidth_axi_arburst), + .s_axi_arlock (pcie_dwidth_axi_arlock), + .s_axi_arcache (pcie_dwidth_axi_arcache), + .s_axi_arprot (pcie_dwidth_axi_arprot), + .s_axi_arregion(pcie_dwidth_axi_arregion), + .s_axi_arqos (pcie_dwidth_axi_arqos), + .s_axi_arvalid (pcie_dwidth_axi_arvalid), + .s_axi_arready (pcie_dwidth_axi_arready), + .s_axi_rid (), + .s_axi_rdata (pcie_dwidth_axi_rdata), + .s_axi_rresp (pcie_dwidth_axi_rresp), + .s_axi_rlast (pcie_dwidth_axi_rlast), + .s_axi_rvalid (pcie_dwidth_axi_rvalid), + .s_axi_rready (pcie_dwidth_axi_rready) + ); `endif endmodule diff --git a/corev_apu/src/ariane.sv b/corev_apu/src/ariane.sv index c009ce70cf6..24fdb7735fe 100644 --- a/corev_apu/src/ariane.sv +++ b/corev_apu/src/ariane.sv @@ -13,87 +13,91 @@ // Description: Ariane Top-level module -module ariane import ariane_pkg::*; #( - parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty, - parameter type rvfi_probes_instr_t = logic, - parameter type rvfi_probes_csr_t = logic, - parameter type rvfi_probes_t = struct packed { - logic csr; - logic instr; - }, - parameter type tip_instr_t = logic, - parameter int unsigned AxiAddrWidth = ariane_axi::AddrWidth, - parameter int unsigned AxiDataWidth = ariane_axi::DataWidth, - parameter int unsigned AxiIdWidth = ariane_axi::IdWidth, - parameter type axi_ar_chan_t = ariane_axi::ar_chan_t, - parameter type axi_aw_chan_t = ariane_axi::aw_chan_t, - parameter type axi_w_chan_t = ariane_axi::w_chan_t, - parameter type noc_req_t = ariane_axi::req_t, - parameter type noc_resp_t = ariane_axi::resp_t +module ariane + import ariane_pkg::*; +#( + parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty, + parameter type rvfi_probes_instr_t = logic, + parameter type rvfi_probes_csr_t = logic, + parameter bit IsTIP = bit'(0), + parameter type rvfi_probes_t = struct packed { + logic csr; + logic instr; + }, + parameter type tip_instr_t = logic, + parameter int unsigned AxiAddrWidth = ariane_axi::AddrWidth, + parameter int unsigned AxiDataWidth = ariane_axi::DataWidth, + parameter int unsigned AxiIdWidth = ariane_axi::IdWidth, + parameter type axi_ar_chan_t = ariane_axi::ar_chan_t, + parameter type axi_aw_chan_t = ariane_axi::aw_chan_t, + parameter type axi_w_chan_t = ariane_axi::w_chan_t, + parameter type noc_req_t = ariane_axi::req_t, + parameter type noc_resp_t = ariane_axi::resp_t ) ( - input logic clk_i, - input logic rst_ni, - // Core ID, Cluster ID and boot address are considered more or less static - input logic [CVA6Cfg.VLEN-1:0] boot_addr_i, // reset boot address - input logic [CVA6Cfg.XLEN-1:0] hart_id_i, // hart id in a multicore environment (reflected in a CSR) + input logic clk_i, + input logic rst_ni, + // Core ID, Cluster ID and boot address are considered more or less static + input logic [CVA6Cfg.VLEN-1:0] boot_addr_i, // reset boot address + input logic [CVA6Cfg.XLEN-1:0] hart_id_i, // hart id in a multicore environment (reflected in a CSR) - // Interrupt inputs - input logic [1:0] irq_i, // level sensitive IR lines, mip & sip (async) - input logic ipi_i, // inter-processor interrupts (async) - // Timer facilities - input logic time_irq_i, // timer interrupt in (async) - input logic debug_req_i, // debug request (async) - // RISC-V formal interface port (`rvfi`): - // Can be left open when formal tracing is not needed. - output rvfi_probes_t rvfi_probes_o, + // Interrupt inputs + input logic [1:0] irq_i, // level sensitive IR lines, mip & sip (async) + input logic ipi_i, // inter-processor interrupts (async) + // Timer facilities + input logic time_irq_i, // timer interrupt in (async) + input logic debug_req_i, // debug request (async) + // RISC-V formal interface port (`rvfi`): + // Can be left open when formal tracing is not needed. + output rvfi_probes_t rvfi_probes_o, - //Tracing port: TIP - output tip_instr_t [CVA6Cfg.NrCommitPorts-1:0] tip_o, + //Tracing port: TIP + output tip_instr_t [CVA6Cfg.NrCommitPorts-1:0] tip_o, - // memory side - output noc_req_t noc_req_o, - input noc_resp_t noc_resp_i + // memory side + output noc_req_t noc_req_o, + input noc_resp_t noc_resp_i ); cvxif_pkg::cvxif_req_t cvxif_req; cvxif_pkg::cvxif_resp_t cvxif_resp; cva6 #( - .CVA6Cfg ( CVA6Cfg ), - .rvfi_probes_instr_t ( rvfi_probes_instr_t ), - .rvfi_probes_csr_t ( rvfi_probes_csr_t ), - .rvfi_probes_t ( rvfi_probes_t ), - .axi_ar_chan_t (axi_ar_chan_t), - .axi_aw_chan_t (axi_aw_chan_t), - .axi_w_chan_t (axi_w_chan_t), - .noc_req_t (noc_req_t), - .noc_resp_t (noc_resp_t) + .CVA6Cfg(CVA6Cfg), + .rvfi_probes_instr_t(rvfi_probes_instr_t), + .rvfi_probes_csr_t(rvfi_probes_csr_t), + .rvfi_probes_t(rvfi_probes_t), + .axi_ar_chan_t(axi_ar_chan_t), + .axi_aw_chan_t(axi_aw_chan_t), + .axi_w_chan_t(axi_w_chan_t), + .noc_req_t(noc_req_t), + .noc_resp_t(noc_resp_t), + .IsTIP(IsTIP) ) i_cva6 ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .boot_addr_i ( boot_addr_i ), - .hart_id_i ( hart_id_i ), - .irq_i ( irq_i ), - .ipi_i ( ipi_i ), - .time_irq_i ( time_irq_i ), - .debug_req_i ( debug_req_i ), - .rvfi_probes_o ( rvfi_probes_o ), - .cvxif_req_o ( cvxif_req ), - .cvxif_resp_i ( cvxif_resp ), - .noc_req_o ( noc_req_o ), - .noc_resp_i ( noc_resp_i ), - .tip_o (tip_o ) + .clk_i (clk_i), + .rst_ni (rst_ni), + .boot_addr_i (boot_addr_i), + .hart_id_i (hart_id_i), + .irq_i (irq_i), + .ipi_i (ipi_i), + .time_irq_i (time_irq_i), + .debug_req_i (debug_req_i), + .rvfi_probes_o(rvfi_probes_o), + .cvxif_req_o (cvxif_req), + .cvxif_resp_i (cvxif_resp), + .noc_req_o (noc_req_o), + .noc_resp_i (noc_resp_i), + .tip_o (tip_o) ); if (CVA6Cfg.CvxifEn) begin : gen_example_coprocessor cvxif_example_coprocessor #( - .CVA6Cfg ( CVA6Cfg ) + .CVA6Cfg(CVA6Cfg) ) i_cvxif_coprocessor ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .cvxif_req_i ( cvxif_req ), - .cvxif_resp_o ( cvxif_resp ) + .clk_i (clk_i), + .rst_ni (rst_ni), + .cvxif_req_i (cvxif_req), + .cvxif_resp_o(cvxif_resp) ); end -endmodule // ariane +endmodule // ariane diff --git a/corev_apu/tb/ariane_testharness.sv b/corev_apu/tb/ariane_testharness.sv index 261a5043d03..a0446a5c1f6 100644 --- a/corev_apu/tb/ariane_testharness.sv +++ b/corev_apu/tb/ariane_testharness.sv @@ -23,21 +23,24 @@ `endif module ariane_testharness #( - parameter config_pkg::cva6_cfg_t CVA6Cfg = build_config_pkg::build_config(cva6_config_pkg::cva6_cfg), - // - parameter int unsigned AXI_USER_WIDTH = CVA6Cfg.AxiUserWidth, - parameter int unsigned AXI_USER_EN = CVA6Cfg.AXI_USER_EN, - parameter int unsigned AXI_ADDRESS_WIDTH = 64, - parameter int unsigned AXI_DATA_WIDTH = 64, - parameter bit InclSimDTM = 1'b1, - parameter int unsigned NUM_WORDS = 2**25, // memory size - parameter bit StallRandomOutput = 1'b0, - parameter bit StallRandomInput = 1'b0 + parameter config_pkg::cva6_cfg_t CVA6Cfg = build_config_pkg::build_config( + cva6_config_pkg::cva6_cfg + ), + // + parameter int unsigned AXI_USER_WIDTH = CVA6Cfg.AxiUserWidth, + parameter int unsigned AXI_USER_EN = CVA6Cfg.AXI_USER_EN, + parameter int unsigned AXI_ADDRESS_WIDTH = 64, + parameter int unsigned AXI_DATA_WIDTH = 64, + parameter bit InclSimDTM = 1'b1, + parameter int unsigned NUM_WORDS = 2 ** 25, // memory size + parameter bit StallRandomOutput = 1'b0, + parameter bit StallRandomInput = 1'b0, + parameter bit IsTIP = bit'(0) ) ( - input logic clk_i, - input logic rtc_i, - input logic rst_ni, - output logic [31:0] exit_o + input logic clk_i, + input logic rtc_i, + input logic rst_ni, + output logic [31:0] exit_o ); localparam [7:0] hart_id = '0; @@ -51,85 +54,85 @@ module ariane_testharness #( localparam type rvfi_probes_instr_t = `RVFI_PROBES_INSTR_T(CVA6Cfg); localparam type rvfi_probes_csr_t = `RVFI_PROBES_CSR_T(CVA6Cfg); localparam type rvfi_probes_t = struct packed { - rvfi_probes_csr_t csr; + rvfi_probes_csr_t csr; rvfi_probes_instr_t instr; }; //TIP parameter parameter type tip_instr_t = struct packed { - logic [config_pkg::NRET-1:0] iretire; - logic [config_pkg::NRET*riscv::XLEN-1:0] iaddr; //PC address - logic [config_pkg::NRET*riscv::XLEN-1:0] time_t; - logic [config_pkg::NRET*3-1:0] priv; - logic [config_pkg::NRET*riscv::XLEN-1:0] cause; - logic [config_pkg::NRET*riscv::XLEN-1:0] tval; - logic [config_pkg::NRET*(riscv::XLEN/2)-1:0] itype; + logic [config_pkg::NRET-1:0] iretire; + logic [config_pkg::NRET*riscv::XLEN-1:0] iaddr; //PC address + logic [config_pkg::NRET*riscv::XLEN-1:0] time_t; + logic [config_pkg::NRET*3-1:0] priv; + logic [config_pkg::NRET*riscv::XLEN-1:0] cause; + logic [config_pkg::NRET*riscv::XLEN-1:0] tval; + logic [config_pkg::NRET*(riscv::XLEN/2)-1:0] itype; }; // disable test-enable - logic test_en; - logic ndmreset; - logic ndmreset_n; - logic debug_req_core; + logic test_en; + logic ndmreset; + logic ndmreset_n; + logic debug_req_core; - int jtag_enable; - logic init_done; + int jtag_enable; + logic init_done; logic [31:0] jtag_exit, dmi_exit; - logic [31:0] rvfi_exit; - logic [31:0] tracer_exit; - logic [31:0] tandem_exit; - - logic jtag_TCK; - logic jtag_TMS; - logic jtag_TDI; - logic jtag_TRSTn; - logic jtag_TDO_data; - logic jtag_TDO_driven; - - logic debug_req_valid; - logic debug_req_ready; - logic debug_resp_valid; - logic debug_resp_ready; - - logic jtag_req_valid; - logic [6:0] jtag_req_bits_addr; - logic [1:0] jtag_req_bits_op; - logic [31:0] jtag_req_bits_data; - logic jtag_resp_ready; - logic jtag_resp_valid; - - logic dmi_req_valid; - logic dmi_resp_ready; - logic dmi_resp_valid; - - dm::dmi_req_t jtag_dmi_req; - dm::dmi_req_t dmi_req; - - dm::dmi_req_t debug_req; - dm::dmi_resp_t debug_resp; + logic [31:0] rvfi_exit; + logic [31:0] tracer_exit; + logic [31:0] tandem_exit; + + logic jtag_TCK; + logic jtag_TMS; + logic jtag_TDI; + logic jtag_TRSTn; + logic jtag_TDO_data; + logic jtag_TDO_driven; + + logic debug_req_valid; + logic debug_req_ready; + logic debug_resp_valid; + logic debug_resp_ready; + + logic jtag_req_valid; + logic [ 6:0] jtag_req_bits_addr; + logic [ 1:0] jtag_req_bits_op; + logic [31:0] jtag_req_bits_data; + logic jtag_resp_ready; + logic jtag_resp_valid; + + logic dmi_req_valid; + logic dmi_resp_ready; + logic dmi_resp_valid; + + dm::dmi_req_t jtag_dmi_req; + dm::dmi_req_t dmi_req; + + dm::dmi_req_t debug_req; + dm::dmi_resp_t debug_resp; assign test_en = 1'b0; AXI_BUS #( - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidth ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) - ) slave[ariane_soc::NrSlaves-1:0](); + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidth), + .AXI_USER_WIDTH(AXI_USER_WIDTH) + ) slave[ariane_soc::NrSlaves-1:0] (); AXI_BUS #( - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) - ) master[ariane_soc::NB_PERIPHERALS-1:0](); + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_USER_WIDTH(AXI_USER_WIDTH) + ) master[ariane_soc::NB_PERIPHERALS-1:0] (); rstgen i_rstgen_main ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni & (~ndmreset) ), - .test_mode_i ( test_en ), - .rst_no ( ndmreset_n ), - .init_no ( ) // keep open + .clk_i (clk_i), + .rst_ni (rst_ni & (~ndmreset)), + .test_mode_i(test_en), + .rst_no (ndmreset_n), + .init_no () // keep open ); // --------------- @@ -140,55 +143,56 @@ module ariane_testharness #( logic debug_enable; initial begin if (!$value$plusargs("jtag_rbb_enable=%b", jtag_enable)) jtag_enable = 'h0; - if ($test$plusargs("debug_disable")) debug_enable = 'h0; else debug_enable = 'h1; + if ($test$plusargs("debug_disable")) debug_enable = 'h0; + else debug_enable = 'h1; if (CVA6Cfg.XLEN != 32 & CVA6Cfg.XLEN != 64) $error("CVA6Cfg.XLEN different from 32 and 64"); end // debug if MUX - assign debug_req_valid = (jtag_enable[0]) ? jtag_req_valid : dmi_req_valid; - assign debug_resp_ready = (jtag_enable[0]) ? jtag_resp_ready : dmi_resp_ready; - assign debug_req = (jtag_enable[0]) ? jtag_dmi_req : dmi_req; + assign debug_req_valid = (jtag_enable[0]) ? jtag_req_valid : dmi_req_valid; + assign debug_resp_ready = (jtag_enable[0]) ? jtag_resp_ready : dmi_resp_ready; + assign debug_req = (jtag_enable[0]) ? jtag_dmi_req : dmi_req; if (ariane_pkg::RVFI) begin - assign exit_o = (jtag_enable[0]) ? jtag_exit : rvfi_exit; + assign exit_o = (jtag_enable[0]) ? jtag_exit : rvfi_exit; end else begin - assign exit_o = (jtag_enable[0]) ? jtag_exit : dmi_exit; + assign exit_o = (jtag_enable[0]) ? jtag_exit : dmi_exit; end - assign jtag_resp_valid = (jtag_enable[0]) ? debug_resp_valid : 1'b0; - assign dmi_resp_valid = (jtag_enable[0]) ? 1'b0 : debug_resp_valid; + assign jtag_resp_valid = (jtag_enable[0]) ? debug_resp_valid : 1'b0; + assign dmi_resp_valid = (jtag_enable[0]) ? 1'b0 : debug_resp_valid; // SiFive's SimJTAG Module // Converts to DPI calls SimJTAG i_SimJTAG ( - .clock ( clk_i ), - .reset ( ~rst_ni ), - .enable ( jtag_enable[0] ), - .init_done ( init_done ), - .jtag_TCK ( jtag_TCK ), - .jtag_TMS ( jtag_TMS ), - .jtag_TDI ( jtag_TDI ), - .jtag_TRSTn ( jtag_TRSTn ), - .jtag_TDO_data ( jtag_TDO_data ), - .jtag_TDO_driven ( jtag_TDO_driven ), - .exit ( jtag_exit ) + .clock (clk_i), + .reset (~rst_ni), + .enable (jtag_enable[0]), + .init_done (init_done), + .jtag_TCK (jtag_TCK), + .jtag_TMS (jtag_TMS), + .jtag_TDI (jtag_TDI), + .jtag_TRSTn (jtag_TRSTn), + .jtag_TDO_data (jtag_TDO_data), + .jtag_TDO_driven(jtag_TDO_driven), + .exit (jtag_exit) ); dmi_jtag i_dmi_jtag ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .testmode_i ( test_en ), - .dmi_req_o ( jtag_dmi_req ), - .dmi_req_valid_o ( jtag_req_valid ), - .dmi_req_ready_i ( debug_req_ready ), - .dmi_resp_i ( debug_resp ), - .dmi_resp_ready_o ( jtag_resp_ready ), - .dmi_resp_valid_i ( jtag_resp_valid ), - .dmi_rst_no ( ), // not connected - .tck_i ( jtag_TCK ), - .tms_i ( jtag_TMS ), - .trst_ni ( jtag_TRSTn ), - .td_i ( jtag_TDI ), - .td_o ( jtag_TDO_data ), - .tdo_oe_o ( jtag_TDO_driven ) + .clk_i (clk_i), + .rst_ni (rst_ni), + .testmode_i (test_en), + .dmi_req_o (jtag_dmi_req), + .dmi_req_valid_o (jtag_req_valid), + .dmi_req_ready_i (debug_req_ready), + .dmi_resp_i (debug_resp), + .dmi_resp_ready_o(jtag_resp_ready), + .dmi_resp_valid_i(jtag_resp_valid), + .dmi_rst_no (), // not connected + .tck_i (jtag_TCK), + .tms_i (jtag_TMS), + .trst_ni (jtag_TRSTn), + .td_i (jtag_TDI), + .td_o (jtag_TDO_data), + .tdo_oe_o (jtag_TDO_driven) ); // SiFive's SimDTM Module @@ -198,18 +202,18 @@ module ariane_testharness #( if (InclSimDTM) begin SimDTM i_SimDTM ( - .clk ( clk_i ), - .reset ( ~rst_ni ), - .debug_req_valid ( dmi_req_valid ), - .debug_req_ready ( debug_req_ready ), - .debug_req_bits_addr ( dmi_req.addr ), - .debug_req_bits_op ( debug_req_bits_op ), - .debug_req_bits_data ( dmi_req.data ), - .debug_resp_valid ( dmi_resp_valid ), - .debug_resp_ready ( dmi_resp_ready ), - .debug_resp_bits_resp ( debug_resp.resp ), - .debug_resp_bits_data ( debug_resp.data ), - .exit ( dmi_exit ) + .clk (clk_i), + .reset (~rst_ni), + .debug_req_valid (dmi_req_valid), + .debug_req_ready (debug_req_ready), + .debug_req_bits_addr (dmi_req.addr), + .debug_req_bits_op (debug_req_bits_op), + .debug_req_bits_data (dmi_req.data), + .debug_resp_valid (dmi_resp_valid), + .debug_resp_ready (dmi_resp_ready), + .debug_resp_bits_resp(debug_resp.resp), + .debug_resp_bits_data(debug_resp.data), + .exit (dmi_exit) ); end else begin assign dmi_req_valid = '0; @@ -228,121 +232,120 @@ module ariane_testharness #( int dmi_del_cnt_d, dmi_del_cnt_q; assign dmi_del_cnt_d = (dmi_del_cnt_q) ? dmi_del_cnt_q - 1 : 0; - assign debug_req_core = (dmi_del_cnt_q) ? 1'b0 : - (!debug_enable) ? 1'b0 : debug_req_core_ungtd; + assign debug_req_core = (dmi_del_cnt_q) ? 1'b0 : (!debug_enable) ? 1'b0 : debug_req_core_ungtd; always_ff @(posedge clk_i or negedge rst_ni) begin : p_dmi_del_cnt - if(!rst_ni) begin + if (!rst_ni) begin dmi_del_cnt_q <= DmiDelCycles; end else begin dmi_del_cnt_q <= dmi_del_cnt_d; end end - ariane_axi::req_t dm_axi_m_req; - ariane_axi::resp_t dm_axi_m_resp; - - logic dm_slave_req; - logic dm_slave_we; - logic [64-1:0] dm_slave_addr; - logic [64/8-1:0] dm_slave_be; - logic [64-1:0] dm_slave_wdata; - logic [64-1:0] dm_slave_rdata; - - logic dm_master_req; - logic [64-1:0] dm_master_add; - logic dm_master_we; - logic [64-1:0] dm_master_wdata; - logic [64/8-1:0] dm_master_be; - logic dm_master_gnt; - logic dm_master_r_valid; - logic [64-1:0] dm_master_r_rdata; + ariane_axi::req_t dm_axi_m_req; + ariane_axi::resp_t dm_axi_m_resp; + + logic dm_slave_req; + logic dm_slave_we; + logic [ 64-1:0] dm_slave_addr; + logic [64/8-1:0] dm_slave_be; + logic [ 64-1:0] dm_slave_wdata; + logic [ 64-1:0] dm_slave_rdata; + + logic dm_master_req; + logic [ 64-1:0] dm_master_add; + logic dm_master_we; + logic [ 64-1:0] dm_master_wdata; + logic [64/8-1:0] dm_master_be; + logic dm_master_gnt; + logic dm_master_r_valid; + logic [ 64-1:0] dm_master_r_rdata; // debug module dm_top #( - .NrHarts ( 1 ), - .BusWidth ( AXI_DATA_WIDTH ), - .SelectableHarts ( 1'b1 ) + .NrHarts (1), + .BusWidth (AXI_DATA_WIDTH), + .SelectableHarts(1'b1) ) i_dm_top ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), // PoR - .testmode_i ( test_en ), - .ndmreset_o ( ndmreset ), - .dmactive_o ( ), // active debug session - .debug_req_o ( debug_req_core_ungtd ), - .unavailable_i ( '0 ), - .hartinfo_i ( {ariane_pkg::DebugHartInfo} ), - .slave_req_i ( dm_slave_req ), - .slave_we_i ( dm_slave_we ), - .slave_addr_i ( dm_slave_addr ), - .slave_be_i ( dm_slave_be ), - .slave_wdata_i ( dm_slave_wdata ), - .slave_rdata_o ( dm_slave_rdata ), - .master_req_o ( dm_master_req ), - .master_add_o ( dm_master_add ), - .master_we_o ( dm_master_we ), - .master_wdata_o ( dm_master_wdata ), - .master_be_o ( dm_master_be ), - .master_gnt_i ( dm_master_gnt ), - .master_r_valid_i ( dm_master_r_valid ), - .master_r_rdata_i ( dm_master_r_rdata ), - .dmi_rst_ni ( rst_ni ), - .dmi_req_valid_i ( debug_req_valid ), - .dmi_req_ready_o ( debug_req_ready ), - .dmi_req_i ( debug_req ), - .dmi_resp_valid_o ( debug_resp_valid ), - .dmi_resp_ready_i ( debug_resp_ready ), - .dmi_resp_o ( debug_resp ) + .clk_i (clk_i), + .rst_ni (rst_ni), // PoR + .testmode_i (test_en), + .ndmreset_o (ndmreset), + .dmactive_o (), // active debug session + .debug_req_o (debug_req_core_ungtd), + .unavailable_i ('0), + .hartinfo_i ({ariane_pkg::DebugHartInfo}), + .slave_req_i (dm_slave_req), + .slave_we_i (dm_slave_we), + .slave_addr_i (dm_slave_addr), + .slave_be_i (dm_slave_be), + .slave_wdata_i (dm_slave_wdata), + .slave_rdata_o (dm_slave_rdata), + .master_req_o (dm_master_req), + .master_add_o (dm_master_add), + .master_we_o (dm_master_we), + .master_wdata_o (dm_master_wdata), + .master_be_o (dm_master_be), + .master_gnt_i (dm_master_gnt), + .master_r_valid_i(dm_master_r_valid), + .master_r_rdata_i(dm_master_r_rdata), + .dmi_rst_ni (rst_ni), + .dmi_req_valid_i (debug_req_valid), + .dmi_req_ready_o (debug_req_ready), + .dmi_req_i (debug_req), + .dmi_resp_valid_o(debug_resp_valid), + .dmi_resp_ready_i(debug_resp_ready), + .dmi_resp_o (debug_resp) ); axi2mem #( - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_USER_WIDTH(AXI_USER_WIDTH) ) i_dm_axi2mem ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .slave ( master[ariane_soc::Debug] ), - .req_o ( dm_slave_req ), - .we_o ( dm_slave_we ), - .addr_o ( dm_slave_addr ), - .be_o ( dm_slave_be ), - .user_o ( ), - .data_o ( dm_slave_wdata ), - .user_i ( '0 ), - .data_i ( dm_slave_rdata ) + .clk_i (clk_i), + .rst_ni(rst_ni), + .slave (master[ariane_soc::Debug]), + .req_o (dm_slave_req), + .we_o (dm_slave_we), + .addr_o(dm_slave_addr), + .be_o (dm_slave_be), + .user_o(), + .data_o(dm_slave_wdata), + .user_i('0), + .data_i(dm_slave_rdata) ); `AXI_ASSIGN_FROM_REQ(slave[1], dm_axi_m_req) `AXI_ASSIGN_TO_RESP(dm_axi_m_resp, slave[1]) axi_adapter #( - .CVA6Cfg ( CVA6Cfg ), - .DATA_WIDTH ( AXI_DATA_WIDTH ), - .axi_req_t ( ariane_axi::req_t ), - .axi_rsp_t ( ariane_axi::resp_t ) + .CVA6Cfg (CVA6Cfg), + .DATA_WIDTH(AXI_DATA_WIDTH), + .axi_req_t (ariane_axi::req_t), + .axi_rsp_t (ariane_axi::resp_t) ) i_dm_axi_master ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .req_i ( dm_master_req ), - .type_i ( ariane_pkg::SINGLE_REQ ), - .amo_i ( ariane_pkg::AMO_NONE ), - .gnt_o ( dm_master_gnt ), - .addr_i ( dm_master_add ), - .we_i ( dm_master_we ), - .wdata_i ( dm_master_wdata ), - .be_i ( dm_master_be ), - .size_i ( 2'b11 ), // always do 64bit here and use byte enables to gate - .id_i ( '0 ), - .valid_o ( dm_master_r_valid ), - .rdata_o ( dm_master_r_rdata ), - .id_o ( ), - .critical_word_o ( ), - .critical_word_valid_o ( ), - .axi_req_o ( dm_axi_m_req ), - .axi_resp_i ( dm_axi_m_resp ) + .clk_i(clk_i), + .rst_ni(rst_ni), + .req_i(dm_master_req), + .type_i(ariane_pkg::SINGLE_REQ), + .amo_i(ariane_pkg::AMO_NONE), + .gnt_o(dm_master_gnt), + .addr_i(dm_master_add), + .we_i(dm_master_we), + .wdata_i(dm_master_wdata), + .be_i(dm_master_be), + .size_i(2'b11), // always do 64bit here and use byte enables to gate + .id_i('0), + .valid_o(dm_master_r_valid), + .rdata_o(dm_master_r_rdata), + .id_o(), + .critical_word_o(), + .critical_word_valid_o(), + .axi_req_o(dm_axi_m_req), + .axi_resp_i(dm_axi_m_resp) ); @@ -351,32 +354,32 @@ module ariane_testharness #( // --------------- logic rom_req; logic [AXI_ADDRESS_WIDTH-1:0] rom_addr; - logic [AXI_DATA_WIDTH-1:0] rom_rdata; + logic [ AXI_DATA_WIDTH-1:0] rom_rdata; axi2mem #( - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_USER_WIDTH(AXI_USER_WIDTH) ) i_axi2rom ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .slave ( master[ariane_soc::ROM] ), - .req_o ( rom_req ), - .we_o ( ), - .addr_o ( rom_addr ), - .be_o ( ), - .user_o ( ), - .data_o ( ), - .user_i ( '0 ), - .data_i ( rom_rdata ) + .clk_i (clk_i), + .rst_ni(ndmreset_n), + .slave (master[ariane_soc::ROM]), + .req_o (rom_req), + .we_o (), + .addr_o(rom_addr), + .be_o (), + .user_o(), + .data_o(), + .user_i('0), + .data_i(rom_rdata) ); bootrom i_bootrom ( - .clk_i ( clk_i ), - .req_i ( rom_req ), - .addr_i ( rom_addr ), - .rdata_o ( rom_rdata ) + .clk_i (clk_i), + .req_i (rom_req), + .addr_i (rom_addr), + .rdata_o(rom_rdata) ); // ------------------------------ @@ -390,15 +393,15 @@ module ariane_testharness #( `AXI_ASSIGN_TO_REQ(gpio_req, master[ariane_soc::GPIO]) `AXI_ASSIGN_FROM_RESP(master[ariane_soc::GPIO], gpio_resp) axi_err_slv #( - .AxiIdWidth ( ariane_axi_soc::IdWidthSlave ), - .req_t ( ariane_axi_soc::req_slv_t ), - .resp_t ( ariane_axi_soc::resp_slv_t ) + .AxiIdWidth(ariane_axi_soc::IdWidthSlave), + .req_t (ariane_axi_soc::req_slv_t), + .resp_t (ariane_axi_soc::resp_slv_t) ) i_gpio_err_slv ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .test_i ( test_en ), - .slv_req_i ( gpio_req ), - .slv_resp_o ( gpio_resp ) + .clk_i (clk_i), + .rst_ni (ndmreset_n), + .test_i (test_en), + .slv_req_i (gpio_req), + .slv_resp_o(gpio_resp) ); @@ -406,98 +409,98 @@ module ariane_testharness #( // Memory + Exclusive Access // ------------------------------ AXI_BUS #( - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) - ) dram(); + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_USER_WIDTH(AXI_USER_WIDTH) + ) dram (); logic req; logic we; logic [AXI_ADDRESS_WIDTH-1:0] addr; - logic [AXI_DATA_WIDTH/8-1:0] be; - logic [AXI_DATA_WIDTH-1:0] wdata; - logic [AXI_DATA_WIDTH-1:0] rdata; - logic [AXI_USER_WIDTH-1:0] wuser; - logic [AXI_USER_WIDTH-1:0] ruser; + logic [ AXI_DATA_WIDTH/8-1:0] be; + logic [ AXI_DATA_WIDTH-1:0] wdata; + logic [ AXI_DATA_WIDTH-1:0] rdata; + logic [ AXI_USER_WIDTH-1:0] wuser; + logic [ AXI_USER_WIDTH-1:0] ruser; axi_riscv_atomics_wrap #( - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ), - .AXI_MAX_WRITE_TXNS ( 1 ), - .RISCV_WORD_WIDTH ( 64 ) + .AXI_ADDR_WIDTH (AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH (AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_USER_WIDTH (AXI_USER_WIDTH), + .AXI_MAX_WRITE_TXNS(1), + .RISCV_WORD_WIDTH (64) ) i_axi_riscv_atomics ( - .clk_i, - .rst_ni ( ndmreset_n ), - .slv ( master[ariane_soc::DRAM] ), - .mst ( dram ) + .clk_i, + .rst_ni(ndmreset_n), + .slv (master[ariane_soc::DRAM]), + .mst (dram) ); AXI_BUS #( - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) - ) dram_delayed(); + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_USER_WIDTH(AXI_USER_WIDTH) + ) dram_delayed (); axi_delayer_intf #( - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ), - .STALL_RANDOM_INPUT ( StallRandomInput ), - .STALL_RANDOM_OUTPUT ( StallRandomOutput ), - .FIXED_DELAY_INPUT ( 0 ), - .FIXED_DELAY_OUTPUT ( 0 ) + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_ADDR_WIDTH (AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH (AXI_DATA_WIDTH), + .AXI_USER_WIDTH (AXI_USER_WIDTH), + .STALL_RANDOM_INPUT (StallRandomInput), + .STALL_RANDOM_OUTPUT(StallRandomOutput), + .FIXED_DELAY_INPUT (0), + .FIXED_DELAY_OUTPUT (0) ) i_axi_delayer ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .slv ( dram ), - .mst ( dram_delayed ) + .clk_i (clk_i), + .rst_ni(ndmreset_n), + .slv (dram), + .mst (dram_delayed) ); axi2mem #( - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_USER_WIDTH ( AXI_USER_WIDTH ) + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_USER_WIDTH(AXI_USER_WIDTH) ) i_axi2mem ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .slave ( dram_delayed ), - .req_o ( req ), - .we_o ( we ), - .addr_o ( addr ), - .be_o ( be ), - .user_o ( wuser ), - .data_o ( wdata ), - .user_i ( ruser ), - .data_i ( rdata ) + .clk_i (clk_i), + .rst_ni(ndmreset_n), + .slave (dram_delayed), + .req_o (req), + .we_o (we), + .addr_o(addr), + .be_o (be), + .user_o(wuser), + .data_o(wdata), + .user_i(ruser), + .data_i(rdata) ); sram #( - .DATA_WIDTH ( AXI_DATA_WIDTH ), - .USER_WIDTH ( AXI_USER_WIDTH ), - .USER_EN ( AXI_USER_EN ), + .DATA_WIDTH(AXI_DATA_WIDTH), + .USER_WIDTH(AXI_USER_WIDTH), + .USER_EN (AXI_USER_EN), `ifdef VERILATOR - .SIM_INIT ( "none" ), + .SIM_INIT ("none"), `else - .SIM_INIT ( "zeros" ), + .SIM_INIT ("zeros"), `endif - .NUM_WORDS ( NUM_WORDS ) + .NUM_WORDS (NUM_WORDS) ) i_sram ( - .clk_i ( clk_i ), - .rst_ni ( rst_ni ), - .req_i ( req ), - .we_i ( we ), - .addr_i ( addr[$clog2(NUM_WORDS)-1+$clog2(AXI_DATA_WIDTH/8):$clog2(AXI_DATA_WIDTH/8)] ), - .wuser_i ( wuser ), - .wdata_i ( wdata ), - .be_i ( be ), - .ruser_o ( ruser ), - .rdata_o ( rdata ) + .clk_i (clk_i), + .rst_ni (rst_ni), + .req_i (req), + .we_i (we), + .addr_i (addr[$clog2(NUM_WORDS)-1+$clog2(AXI_DATA_WIDTH/8):$clog2(AXI_DATA_WIDTH/8)]), + .wuser_i(wuser), + .wdata_i(wdata), + .be_i (be), + .ruser_o(ruser), + .rdata_o(rdata) ); // --------------- @@ -507,46 +510,86 @@ module ariane_testharness #( axi_pkg::xbar_rule_64_t [ariane_soc::NB_PERIPHERALS-1:0] addr_map; assign addr_map = '{ - '{ idx: ariane_soc::Debug, start_addr: ariane_soc::DebugBase, end_addr: ariane_soc::DebugBase + ariane_soc::DebugLength }, - '{ idx: ariane_soc::ROM, start_addr: ariane_soc::ROMBase, end_addr: ariane_soc::ROMBase + ariane_soc::ROMLength }, - '{ idx: ariane_soc::CLINT, start_addr: ariane_soc::CLINTBase, end_addr: ariane_soc::CLINTBase + ariane_soc::CLINTLength }, - '{ idx: ariane_soc::PLIC, start_addr: ariane_soc::PLICBase, end_addr: ariane_soc::PLICBase + ariane_soc::PLICLength }, - '{ idx: ariane_soc::UART, start_addr: ariane_soc::UARTBase, end_addr: ariane_soc::UARTBase + ariane_soc::UARTLength }, - '{ idx: ariane_soc::Timer, start_addr: ariane_soc::TimerBase, end_addr: ariane_soc::TimerBase + ariane_soc::TimerLength }, - '{ idx: ariane_soc::SPI, start_addr: ariane_soc::SPIBase, end_addr: ariane_soc::SPIBase + ariane_soc::SPILength }, - '{ idx: ariane_soc::Ethernet, start_addr: ariane_soc::EthernetBase, end_addr: ariane_soc::EthernetBase + ariane_soc::EthernetLength }, - '{ idx: ariane_soc::GPIO, start_addr: ariane_soc::GPIOBase, end_addr: ariane_soc::GPIOBase + ariane_soc::GPIOLength }, - '{ idx: ariane_soc::DRAM, start_addr: ariane_soc::DRAMBase, end_addr: ariane_soc::DRAMBase + ariane_soc::DRAMLength } - }; + '{ + idx: ariane_soc::Debug, + start_addr: ariane_soc::DebugBase, + end_addr: ariane_soc::DebugBase + ariane_soc::DebugLength + }, + '{ + idx: ariane_soc::ROM, + start_addr: ariane_soc::ROMBase, + end_addr: ariane_soc::ROMBase + ariane_soc::ROMLength + }, + '{ + idx: ariane_soc::CLINT, + start_addr: ariane_soc::CLINTBase, + end_addr: ariane_soc::CLINTBase + ariane_soc::CLINTLength + }, + '{ + idx: ariane_soc::PLIC, + start_addr: ariane_soc::PLICBase, + end_addr: ariane_soc::PLICBase + ariane_soc::PLICLength + }, + '{ + idx: ariane_soc::UART, + start_addr: ariane_soc::UARTBase, + end_addr: ariane_soc::UARTBase + ariane_soc::UARTLength + }, + '{ + idx: ariane_soc::Timer, + start_addr: ariane_soc::TimerBase, + end_addr: ariane_soc::TimerBase + ariane_soc::TimerLength + }, + '{ + idx: ariane_soc::SPI, + start_addr: ariane_soc::SPIBase, + end_addr: ariane_soc::SPIBase + ariane_soc::SPILength + }, + '{ + idx: ariane_soc::Ethernet, + start_addr: ariane_soc::EthernetBase, + end_addr: ariane_soc::EthernetBase + ariane_soc::EthernetLength + }, + '{ + idx: ariane_soc::GPIO, + start_addr: ariane_soc::GPIOBase, + end_addr: ariane_soc::GPIOBase + ariane_soc::GPIOLength + }, + '{ + idx: ariane_soc::DRAM, + start_addr: ariane_soc::DRAMBase, + end_addr: ariane_soc::DRAMBase + ariane_soc::DRAMLength + } + }; localparam axi_pkg::xbar_cfg_t AXI_XBAR_CFG = '{ - NoSlvPorts: unsigned'(ariane_soc::NrSlaves), - NoMstPorts: unsigned'(ariane_soc::NB_PERIPHERALS), - MaxMstTrans: unsigned'(1), // Probably requires update - MaxSlvTrans: unsigned'(1), // Probably requires update - FallThrough: 1'b0, - LatencyMode: axi_pkg::NO_LATENCY, - AxiIdWidthSlvPorts: unsigned'(ariane_axi_soc::IdWidth), - AxiIdUsedSlvPorts: unsigned'(ariane_axi_soc::IdWidth), - UniqueIds: 1'b0, - AxiAddrWidth: unsigned'(AXI_ADDRESS_WIDTH), - AxiDataWidth: unsigned'(AXI_DATA_WIDTH), - NoAddrRules: unsigned'(ariane_soc::NB_PERIPHERALS) + NoSlvPorts: unsigned'(ariane_soc::NrSlaves), + NoMstPorts: unsigned'(ariane_soc::NB_PERIPHERALS), + MaxMstTrans: unsigned'(1), // Probably requires update + MaxSlvTrans: unsigned'(1), // Probably requires update + FallThrough: 1'b0, + LatencyMode: axi_pkg::NO_LATENCY, + AxiIdWidthSlvPorts: unsigned'(ariane_axi_soc::IdWidth), + AxiIdUsedSlvPorts: unsigned'(ariane_axi_soc::IdWidth), + UniqueIds: 1'b0, + AxiAddrWidth: unsigned'(AXI_ADDRESS_WIDTH), + AxiDataWidth: unsigned'(AXI_DATA_WIDTH), + NoAddrRules: unsigned'(ariane_soc::NB_PERIPHERALS) }; axi_xbar_intf #( - .AXI_USER_WIDTH ( AXI_USER_WIDTH ), - .Cfg ( AXI_XBAR_CFG ), - .rule_t ( axi_pkg::xbar_rule_64_t ) + .AXI_USER_WIDTH(AXI_USER_WIDTH), + .Cfg (AXI_XBAR_CFG), + .rule_t (axi_pkg::xbar_rule_64_t) ) i_axi_xbar ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .test_i ( test_en ), - .slv_ports ( slave ), - .mst_ports ( master ), - .addr_map_i ( addr_map ), - .en_default_mst_port_i ( '0 ), - .default_mst_port_i ( '0 ) + .clk_i (clk_i), + .rst_ni (ndmreset_n), + .test_i (test_en), + .slv_ports (slave), + .mst_ports (master), + .addr_map_i (addr_map), + .en_default_mst_port_i('0), + .default_mst_port_i ('0) ); // --------------- @@ -555,26 +598,26 @@ module ariane_testharness #( logic ipi; logic timer_irq; - ariane_axi_soc::req_slv_t axi_clint_req; + ariane_axi_soc::req_slv_t axi_clint_req; ariane_axi_soc::resp_slv_t axi_clint_resp; clint #( - .CVA6Cfg ( CVA6Cfg ), - .AXI_ADDR_WIDTH ( AXI_ADDRESS_WIDTH ), - .AXI_DATA_WIDTH ( AXI_DATA_WIDTH ), - .AXI_ID_WIDTH ( ariane_axi_soc::IdWidthSlave ), - .NR_CORES ( 1 ), - .axi_req_t ( ariane_axi_soc::req_slv_t ), - .axi_resp_t ( ariane_axi_soc::resp_slv_t ) + .CVA6Cfg (CVA6Cfg), + .AXI_ADDR_WIDTH(AXI_ADDRESS_WIDTH), + .AXI_DATA_WIDTH(AXI_DATA_WIDTH), + .AXI_ID_WIDTH (ariane_axi_soc::IdWidthSlave), + .NR_CORES (1), + .axi_req_t (ariane_axi_soc::req_slv_t), + .axi_resp_t (ariane_axi_soc::resp_slv_t) ) i_clint ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .testmode_i ( test_en ), - .axi_req_i ( axi_clint_req ), - .axi_resp_o ( axi_clint_resp ), - .rtc_i ( rtc_i ), - .timer_irq_o ( timer_irq ), - .ipi_o ( ipi ) + .clk_i (clk_i), + .rst_ni (ndmreset_n), + .testmode_i (test_en), + .axi_req_i (axi_clint_req), + .axi_resp_o (axi_clint_resp), + .rtc_i (rtc_i), + .timer_irq_o(timer_irq), + .ipi_o (ipi) ); `AXI_ASSIGN_TO_REQ(axi_clint_req, master[ariane_soc::CLINT]) @@ -587,83 +630,91 @@ module ariane_testharness #( logic [1:0] irqs; ariane_peripherals #( - .AxiAddrWidth ( AXI_ADDRESS_WIDTH ), - .AxiDataWidth ( AXI_DATA_WIDTH ), - .AxiIdWidth ( ariane_axi_soc::IdWidthSlave ), - .AxiUserWidth ( AXI_USER_WIDTH ), + .AxiAddrWidth(AXI_ADDRESS_WIDTH), + .AxiDataWidth(AXI_DATA_WIDTH), + .AxiIdWidth (ariane_axi_soc::IdWidthSlave), + .AxiUserWidth(AXI_USER_WIDTH), `ifndef VERILATOR - .InclUART ( 1'b1 ), + .InclUART (1'b1), `else - .InclUART ( 1'b0 ), + .InclUART (1'b0), `endif - .InclSPI ( 1'b0 ), - .InclEthernet ( 1'b0 ) + .InclSPI (1'b0), + .InclEthernet(1'b0) ) i_ariane_peripherals ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .plic ( master[ariane_soc::PLIC] ), - .uart ( master[ariane_soc::UART] ), - .spi ( master[ariane_soc::SPI] ), - .ethernet ( master[ariane_soc::Ethernet] ), - .timer ( master[ariane_soc::Timer] ), - .irq_o ( irqs ), - .rx_i ( rx ), - .tx_o ( tx ), - .eth_txck ( ), - .eth_rxck ( ), - .eth_rxctl ( ), - .eth_rxd ( ), - .eth_rst_n ( ), - .eth_tx_en ( ), - .eth_txd ( ), - .phy_mdio ( ), - .eth_mdc ( ), - .mdio ( ), - .mdc ( ), - .spi_clk_o ( ), - .spi_mosi ( ), - .spi_miso ( ), - .spi_ss ( ) + .clk_i (clk_i), + .rst_ni (ndmreset_n), + .plic (master[ariane_soc::PLIC]), + .uart (master[ariane_soc::UART]), + .spi (master[ariane_soc::SPI]), + .ethernet (master[ariane_soc::Ethernet]), + .timer (master[ariane_soc::Timer]), + .irq_o (irqs), + .rx_i (rx), + .tx_o (tx), + .eth_txck (), + .eth_rxck (), + .eth_rxctl(), + .eth_rxd (), + .eth_rst_n(), + .eth_tx_en(), + .eth_txd (), + .phy_mdio (), + .eth_mdc (), + .mdio (), + .mdc (), + .spi_clk_o(), + .spi_mosi (), + .spi_miso (), + .spi_ss () ); - uart_bus #(.BAUD_RATE(115200), .PARITY_EN(0)) i_uart_bus (.rx(tx), .tx(rx), .rx_en(1'b1)); + uart_bus #( + .BAUD_RATE(115200), + .PARITY_EN(0) + ) i_uart_bus ( + .rx(tx), + .tx(rx), + .rx_en(1'b1) + ); // --------------- // Core // --------------- - ariane_axi::req_t axi_ariane_req; - ariane_axi::resp_t axi_ariane_resp; - rvfi_probes_t rvfi_probes; - rvfi_csr_t rvfi_csr; - rvfi_instr_t [CVA6Cfg.NrCommitPorts-1:0] rvfi_instr; - tip_instr_t [CVA6Cfg.NrCommitPorts-1:0] tip_out; + ariane_axi::req_t axi_ariane_req; + ariane_axi::resp_t axi_ariane_resp; + rvfi_probes_t rvfi_probes; + rvfi_csr_t rvfi_csr; + rvfi_instr_t [CVA6Cfg.NrCommitPorts-1:0] rvfi_instr; + tip_instr_t [CVA6Cfg.NrCommitPorts-1:0] tip_out; ariane #( - .CVA6Cfg ( CVA6Cfg ), - .rvfi_probes_instr_t ( rvfi_probes_instr_t ), - .rvfi_probes_csr_t ( rvfi_probes_csr_t ), - .rvfi_probes_t ( rvfi_probes_t ), - .noc_req_t ( ariane_axi::req_t ), - .noc_resp_t ( ariane_axi::resp_t ), - .tip_instr_t ( tip_instr_t ) + .CVA6Cfg (CVA6Cfg), + .rvfi_probes_instr_t(rvfi_probes_instr_t), + .rvfi_probes_csr_t (rvfi_probes_csr_t), + .rvfi_probes_t (rvfi_probes_t), + .noc_req_t (ariane_axi::req_t), + .noc_resp_t (ariane_axi::resp_t), + .tip_instr_t (tip_instr_t), + .IsTIP (IsTIP) ) i_ariane ( - .clk_i ( clk_i ), - .rst_ni ( ndmreset_n ), - .boot_addr_i ( ariane_soc::ROMBase ), // start fetching from ROM - .hart_id_i ( {56'h0, hart_id} ), - .irq_i ( irqs ), - .ipi_i ( ipi ), - .time_irq_i ( timer_irq ), - .rvfi_probes_o ( rvfi_probes ), -// Disable Debug when simulating with Spike + .clk_i (clk_i), + .rst_ni (ndmreset_n), + .boot_addr_i (ariane_soc::ROMBase), // start fetching from ROM + .hart_id_i ({56'h0, hart_id}), + .irq_i (irqs), + .ipi_i (ipi), + .time_irq_i (timer_irq), + .rvfi_probes_o(rvfi_probes), + // Disable Debug when simulating with Spike `ifdef SPIKE_TANDEM - .debug_req_i ( 1'b0 ), + .debug_req_i (1'b0), `else - .debug_req_i ( debug_req_core ), + .debug_req_i (debug_req_core), `endif - .noc_req_o ( axi_ariane_req ), - .noc_resp_i ( axi_ariane_resp ), - .tip_o ( tip_out ) + .noc_req_o (axi_ariane_req), + .noc_resp_i (axi_ariane_resp), + .tip_o (tip_out) ); `AXI_ASSIGN_FROM_REQ(slave[0], axi_ariane_req) @@ -696,79 +747,76 @@ module ariane_testharness #( .rvfi_probes_csr_t(rvfi_probes_csr_t), .rvfi_probes_t(rvfi_probes_t) ) i_cva6_rvfi ( - .clk_i (clk_i), - .rst_ni (rst_ni), + .clk_i (clk_i), + .rst_ni (rst_ni), .rvfi_probes_i(rvfi_probes), - .rvfi_instr_o(rvfi_instr), - .rvfi_csr_o(rvfi_csr) + .rvfi_instr_o (rvfi_instr), + .rvfi_csr_o (rvfi_csr) ); - rvfi_tracer #( - .CVA6Cfg(CVA6Cfg), - .rvfi_instr_t(rvfi_instr_t), - .rvfi_csr_t(rvfi_csr_t), - // - .HART_ID(hart_id), - .DEBUG_START(0), - .DEBUG_STOP(0) + rvfi_tracer #( + .CVA6Cfg(CVA6Cfg), + .rvfi_instr_t(rvfi_instr_t), + .rvfi_csr_t(rvfi_csr_t), + // + .HART_ID(hart_id), + .DEBUG_START(0), + .DEBUG_STOP(0) ) i_rvfi_tracer ( - .clk_i(clk_i), - .rst_ni(rst_ni), - .rvfi_i(rvfi_instr), - .rvfi_csr_i(rvfi_csr), - .end_of_test_o(tracer_exit) + .clk_i(clk_i), + .rst_ni(rst_ni), + .rvfi_i(rvfi_instr), + .rvfi_csr_i(rvfi_csr), + .end_of_test_o(tracer_exit) ); `ifdef SPIKE_TANDEM - spike #( - .CVA6Cfg ( CVA6Cfg ), - .rvfi_instr_t(rvfi_instr_t), - .rvfi_csr_t(rvfi_csr_t) - ) i_spike ( - .clk_i, - .rst_ni, - .clint_tick_i ( rtc_i ), - .rvfi_i ( rvfi_instr ), - .rvfi_csr_i ( rvfi_csr ), - .end_of_test_o ( tandem_exit ) - ); - initial begin - $display("Running binary in tandem mode"); - end - - bit tandem_timeout_enable; - bit [31:0] tandem_timeout; - localparam TANDEM_TIMEOUT_THRESHOLD = 60; + spike #( + .CVA6Cfg(CVA6Cfg), + .rvfi_instr_t(rvfi_instr_t), + .rvfi_csr_t(rvfi_csr_t) + ) i_spike ( + .clk_i, + .rst_ni, + .clint_tick_i (rtc_i), + .rvfi_i (rvfi_instr), + .rvfi_csr_i (rvfi_csr), + .end_of_test_o(tandem_exit) + ); + initial begin + $display("Running binary in tandem mode"); + end - // Tandem timeout logic - always_ff @(posedge clk_i) begin - if(tandem_timeout > TANDEM_TIMEOUT_THRESHOLD) - tandem_timeout_enable <= 0; - else if (tracer_exit) - tandem_timeout_enable <= 1; + bit tandem_timeout_enable; + bit [31:0] tandem_timeout; + localparam TANDEM_TIMEOUT_THRESHOLD = 60; - if (tandem_timeout_enable) - tandem_timeout <= tandem_timeout + 1; - end + // Tandem timeout logic + always_ff @(posedge clk_i) begin + if (tandem_timeout > TANDEM_TIMEOUT_THRESHOLD) tandem_timeout_enable <= 0; + else if (tracer_exit) tandem_timeout_enable <= 1; - always_ff @(posedge clk_i) begin - if (tandem_exit || (tandem_timeout > TANDEM_TIMEOUT_THRESHOLD)) begin - rvfi_exit <= tracer_exit; - end + if (tandem_timeout_enable) tandem_timeout <= tandem_timeout + 1; + end + always_ff @(posedge clk_i) begin + if (tandem_exit || (tandem_timeout > TANDEM_TIMEOUT_THRESHOLD)) begin + rvfi_exit <= tracer_exit; end + + end `else - assign rvfi_exit = tracer_exit; + assign rvfi_exit = tracer_exit; `endif `ifdef VERILATOR - initial begin - string verbosity = 0; - if ($value$plusargs("UVM_VERBOSITY=%s",verbosity)) begin - uvm_set_verbosity_level(verbosity); - `uvm_info("ariane_testharness", $sformatf("Set UVM_VERBOSITY to %s", verbosity), UVM_NONE) - end + initial begin + string verbosity = 0; + if ($value$plusargs("UVM_VERBOSITY=%s", verbosity)) begin + uvm_set_verbosity_level(verbosity); + `uvm_info("ariane_testharness", $sformatf("Set UVM_VERBOSITY to %s", verbosity), UVM_NONE) end + end `endif @@ -776,65 +824,65 @@ module ariane_testharness #( // AXI 4 Assertion IP integration - You will need to get your own copy of this IP if you want // to use it Axi4PC #( - .DATA_WIDTH(ariane_axi_soc::DataWidth), - .WID_WIDTH(ariane_axi_soc::IdWidthSlave), - .RID_WIDTH(ariane_axi_soc::IdWidthSlave), - .AWUSER_WIDTH(ariane_axi_soc::UserWidth), - .WUSER_WIDTH(ariane_axi_soc::UserWidth), - .BUSER_WIDTH(ariane_axi_soc::UserWidth), - .ARUSER_WIDTH(ariane_axi_soc::UserWidth), - .RUSER_WIDTH(ariane_axi_soc::UserWidth), - .ADDR_WIDTH(ariane_axi_soc::AddrWidth) + .DATA_WIDTH(ariane_axi_soc::DataWidth), + .WID_WIDTH(ariane_axi_soc::IdWidthSlave), + .RID_WIDTH(ariane_axi_soc::IdWidthSlave), + .AWUSER_WIDTH(ariane_axi_soc::UserWidth), + .WUSER_WIDTH(ariane_axi_soc::UserWidth), + .BUSER_WIDTH(ariane_axi_soc::UserWidth), + .ARUSER_WIDTH(ariane_axi_soc::UserWidth), + .RUSER_WIDTH(ariane_axi_soc::UserWidth), + .ADDR_WIDTH(ariane_axi_soc::AddrWidth) ) i_Axi4PC ( - .ACLK(clk_i), - .ARESETn(ndmreset_n), - .AWID(dram.aw_id), - .AWADDR(dram.aw_addr), - .AWLEN(dram.aw_len), - .AWSIZE(dram.aw_size), - .AWBURST(dram.aw_burst), - .AWLOCK(dram.aw_lock), - .AWCACHE(dram.aw_cache), - .AWPROT(dram.aw_prot), - .AWQOS(dram.aw_qos), - .AWREGION(dram.aw_region), - .AWUSER(dram.aw_user), - .AWVALID(dram.aw_valid), - .AWREADY(dram.aw_ready), - .WLAST(dram.w_last), - .WDATA(dram.w_data), - .WSTRB(dram.w_strb), - .WUSER(dram.w_user), - .WVALID(dram.w_valid), - .WREADY(dram.w_ready), - .BID(dram.b_id), - .BRESP(dram.b_resp), - .BUSER(dram.b_user), - .BVALID(dram.b_valid), - .BREADY(dram.b_ready), - .ARID(dram.ar_id), - .ARADDR(dram.ar_addr), - .ARLEN(dram.ar_len), - .ARSIZE(dram.ar_size), - .ARBURST(dram.ar_burst), - .ARLOCK(dram.ar_lock), - .ARCACHE(dram.ar_cache), - .ARPROT(dram.ar_prot), - .ARQOS(dram.ar_qos), - .ARREGION(dram.ar_region), - .ARUSER(dram.ar_user), - .ARVALID(dram.ar_valid), - .ARREADY(dram.ar_ready), - .RID(dram.r_id), - .RLAST(dram.r_last), - .RDATA(dram.r_data), - .RRESP(dram.r_resp), - .RUSER(dram.r_user), - .RVALID(dram.r_valid), - .RREADY(dram.r_ready), - .CACTIVE('0), - .CSYSREQ('0), - .CSYSACK('0) + .ACLK(clk_i), + .ARESETn(ndmreset_n), + .AWID(dram.aw_id), + .AWADDR(dram.aw_addr), + .AWLEN(dram.aw_len), + .AWSIZE(dram.aw_size), + .AWBURST(dram.aw_burst), + .AWLOCK(dram.aw_lock), + .AWCACHE(dram.aw_cache), + .AWPROT(dram.aw_prot), + .AWQOS(dram.aw_qos), + .AWREGION(dram.aw_region), + .AWUSER(dram.aw_user), + .AWVALID(dram.aw_valid), + .AWREADY(dram.aw_ready), + .WLAST(dram.w_last), + .WDATA(dram.w_data), + .WSTRB(dram.w_strb), + .WUSER(dram.w_user), + .WVALID(dram.w_valid), + .WREADY(dram.w_ready), + .BID(dram.b_id), + .BRESP(dram.b_resp), + .BUSER(dram.b_user), + .BVALID(dram.b_valid), + .BREADY(dram.b_ready), + .ARID(dram.ar_id), + .ARADDR(dram.ar_addr), + .ARLEN(dram.ar_len), + .ARSIZE(dram.ar_size), + .ARBURST(dram.ar_burst), + .ARLOCK(dram.ar_lock), + .ARCACHE(dram.ar_cache), + .ARPROT(dram.ar_prot), + .ARQOS(dram.ar_qos), + .ARREGION(dram.ar_region), + .ARUSER(dram.ar_user), + .ARVALID(dram.ar_valid), + .ARREADY(dram.ar_ready), + .RID(dram.r_id), + .RLAST(dram.r_last), + .RDATA(dram.r_data), + .RRESP(dram.r_resp), + .RUSER(dram.r_user), + .RVALID(dram.r_valid), + .RREADY(dram.r_ready), + .CACTIVE('0), + .CSYSREQ('0), + .CSYSACK('0) ); `endif