Skip to content

Commit

Permalink
Merge pull request #318 from pulp-platform/includes-tbenz
Browse files Browse the repository at this point in the history 
include/axi: Add support for signal highlighter and add flat port instantiation macros
  • Loading branch information
@thommythomaso
thommythomaso authored Jul 27, 2023
2 parents 634b743 + 75acfc6 commit fc01ef1
Show file tree
Hide file tree
Showing 2 changed files with 162 additions and 0 deletions.
42 changes: 42 additions & 0 deletions include/axi/assign.svh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,4 +652,46 @@
////////////////////////////////////////////////////////////////////////////////////////////////////


////////////////////////////////////////////////////////////////////////////////////////////////////
// Macros instantiating signal highlighter from common verification
// https://github.com/pulp-platform/common_verification.git
// `AXI_HIGHLIGHT(__name, __aw_t, __w_t, __b_t, __ar_t, __r_t, __req, __resp)
`define AXI_HIGHLIGHT(__name, __aw_t, __w_t, __b_t, __ar_t, __r_t, __req, __resp) \
signal_highlighter #( \
.T ( __aw_t ) \
) i_signal_highlighter_``__name``_aw ( \
.ready_i ( __resp.aw_ready ), \
.valid_i ( __req.aw_valid ), \
.data_i ( __req.aw ) \
); \
signal_highlighter #( \
.T ( __w_t ) \
) i_signal_highlighter_``__name``_w ( \
.ready_i ( __resp.w_ready ), \
.valid_i ( __req.w_valid ), \
.data_i ( __req.w ) \
); \
signal_highlighter #( \
.T ( __b_t ) \
) i_signal_highlighter_``__name``_b ( \
.ready_i ( __req.b_ready ), \
.valid_i ( __resp.b_valid ), \
.data_i ( __resp.b ) \
); \
signal_highlighter #( \
.T ( __ar_t ) \
) i_signal_highlighter_``__name``_ar ( \
.ready_i ( __resp.ar_ready ), \
.valid_i ( __req.ar_valid ), \
.data_i ( __req.ar ) \
); \
signal_highlighter #( \
.T ( __r_t ) \
) i_signal_highlighter_``__name``_r ( \
.ready_i ( __req.r_ready ), \
.valid_i ( __resp.r_valid ), \
.data_i ( __resp.r ) \
);
////////////////////////////////////////////////////////////////////////////////////////////////////

`endif
120 changes: 120 additions & 0 deletions include/axi/port.svh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
// Copyright (c) 2014-2023 ETH Zurich, University of Bologna
//
// Copyright and related rights are licensed under the Solderpad Hardware
// License, Version 0.51 (the "License"); you may not use this file except in
// compliance with the License. You may obtain a copy of the License at
// http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law
// or agreed to in writing, software, hardware and materials distributed under
// this License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
//
// Authors:
// - Thomas Benz <[email protected]>

// Macros to add AXI ports

`ifndef AXI_PORT_SVH_
`define AXI_PORT_SVH_

////////////////////////////////////////////////////////////////////////////////////////////////////
// Macros creating flat AXI ports
// `AXI_M_PORT(__name, __addr_t, __data_t, __strb_t, __id_t, __aw_user_t, __w_user_t, __b_user_t, __ar_user_t, __r_user_t)
`define AXI_M_PORT(__name, __addr_t, __data_t, __strb_t, __id_t, __aw_user_t, __w_user_t, __b_user_t, __ar_user_t, __r_user_t) \
output logic m_axi_``__name``_awvalid, \
output __id_t m_axi_``__name``_awid, \
output __addr_t m_axi_``__name``_awaddr, \
output axi_pkg::len_t m_axi_``__name``_awlen, \
output axi_pkg::size_t m_axi_``__name``_awsize, \
output axi_pkg::burst_t m_axi_``__name``_awburst, \
output logic m_axi_``__name``_awlock, \
output axi_pkg::cache_t m_axi_``__name``_awcache, \
output axi_pkg::prot_t m_axi_``__name``_awprot, \
output axi_pkg::qos_t m_axi_``__name``_awqos, \
output axi_pkg::region_t m_axi_``__name``_awregion, \
output __aw_user_t m_axi_``__name``_awuser, \
output logic m_axi_``__name``_wvalid, \
output __data_t m_axi_``__name``_wdata, \
output __strb_t m_axi_``__name``_wstrb, \
output logic m_axi_``__name``_wlast, \
output __w_user_t m_axi_``__name``_wuser, \
output logic m_axi_``__name``_bready, \
output logic m_axi_``__name``_arvalid, \
output __id_t m_axi_``__name``_arid, \
output __addr_t m_axi_``__name``_araddr, \
output axi_pkg::len_t m_axi_``__name``_arlen, \
output axi_pkg::size_t m_axi_``__name``_arsize, \
output axi_pkg::burst_t m_axi_``__name``_arburst, \
output logic m_axi_``__name``_arlock, \
output axi_pkg::cache_t m_axi_``__name``_arcache, \
output axi_pkg::prot_t m_axi_``__name``_arprot, \
output axi_pkg::qos_t m_axi_``__name``_arqos, \
output axi_pkg::region_t m_axi_``__name``_arregion, \
output __ar_user_t m_axi_``__name``_aruser, \
output logic m_axi_``__name``_rready, \
input logic m_axi_``__name``_awready, \
input logic m_axi_``__name``_arready, \
input logic m_axi_``__name``_wready, \
input logic m_axi_``__name``_bvalid, \
input __id_t m_axi_``__name``_bid, \
input axi_pkg::resp_t m_axi_``__name``_bresp, \
input __b_user_t m_axi_``__name``_buser, \
input logic m_axi_``__name``_rvalid, \
input __id_t m_axi_``__name``_rid, \
input __data_t m_axi_``__name``_rdata, \
input axi_pkg::resp_t m_axi_``__name``_rresp, \
input logic m_axi_``__name``_rlast, \
input __r_user_t m_axi_``__name``_ruser, \
////////////////////////////////////////////////////////////////////////////////////////////////////

////////////////////////////////////////////////////////////////////////////////////////////////////
// Macros creating flat AXI ports
// `AXI_S_PORT(__name, __addr_t, __data_t, __strb_t, __id_t, __aw_user_t, __w_user_t, __b_user_t, __ar_user_t, __r_user_t)
`define AXI_S_PORT(__name, __addr_t, __data_t, __strb_t, __id_t, __aw_user_t, __w_user_t, __b_user_t, __ar_user_t, __r_user_t) \
input logic s_axi_``__name``_awvalid, \
input __id_t s_axi_``__name``_awid, \
input __addr_t s_axi_``__name``_awaddr, \
input axi_pkg::len_t s_axi_``__name``_awlen, \
input axi_pkg::size_t s_axi_``__name``_awsize, \
input axi_pkg::burst_t s_axi_``__name``_awburst, \
input logic s_axi_``__name``_awlock, \
input axi_pkg::cache_t s_axi_``__name``_awcache, \
input axi_pkg::prot_t s_axi_``__name``_awprot, \
input axi_pkg::qos_t s_axi_``__name``_awqos, \
input axi_pkg::region_t s_axi_``__name``_awregion, \
input __aw_user_t s_axi_``__name``_awuser, \
input logic s_axi_``__name``_wvalid, \
input __data_t s_axi_``__name``_wdata, \
input __strb_t s_axi_``__name``_wstrb, \
input logic s_axi_``__name``_wlast, \
input __w_user_t s_axi_``__name``_wuser, \
input logic s_axi_``__name``_bready, \
input logic s_axi_``__name``_arvalid, \
input __id_t s_axi_``__name``_arid, \
input __addr_t s_axi_``__name``_araddr, \
input axi_pkg::len_t s_axi_``__name``_arlen, \
input axi_pkg::size_t s_axi_``__name``_arsize, \
input axi_pkg::burst_t s_axi_``__name``_arburst, \
input logic s_axi_``__name``_arlock, \
input axi_pkg::cache_t s_axi_``__name``_arcache, \
input axi_pkg::prot_t s_axi_``__name``_arprot, \
input axi_pkg::qos_t s_axi_``__name``_arqos, \
input axi_pkg::region_t s_axi_``__name``_arregion, \
input __ar_user_t s_axi_``__name``_aruser, \
input logic s_axi_``__name``_rready, \
output logic s_axi_``__name``_awready, \
output logic s_axi_``__name``_arready, \
output logic s_axi_``__name``_wready, \
output logic s_axi_``__name``_bvalid, \
output __id_t s_axi_``__name``_bid, \
output axi_pkg::resp_t s_axi_``__name``_bresp, \
output __b_user_t s_axi_``__name``_buser, \
output logic s_axi_``__name``_rvalid, \
output __id_t s_axi_``__name``_rid, \
output __data_t s_axi_``__name``_rdata, \
output axi_pkg::resp_t s_axi_``__name``_rresp, \
output logic s_axi_``__name``_rlast, \
output __r_user_t s_axi_``__name``_ruser, \
////////////////////////////////////////////////////////////////////////////////////////////////////

`endif

0 comments on commit fc01ef1

Please sign in to comment.