zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

axi_clock_monitor: Fix various issues 

- Replace .xdc file
- Remove parameter dependency for wire signals
- Fix typo
- Remove unnecessary comments
- Fix signal width
main
AndrDragomir 2022-04-04 09:11:13 +01:00 committed by AndrDragomir
parent fe713a5e98
commit 60be01f2eb
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/axi_clock_monitor/Makefile
View File

@ -10,7 +10,7 @@ GENERIC_DEPS += ../common/up_axi.v
GENERIC_DEPS += axi_clock_monitor.v GENERIC_DEPS += axi_clock_monitor.v
XILINX_DEPS += ../common/up_clock_mon.v XILINX_DEPS += ../common/up_clock_mon.v
XILINX_DEPS += axi_clock_monitor_constr.xdc XILINX_DEPS += ../xilinx/common/up_clock_mon_constr.xdc
XILINX_DEPS += axi_clock_monitor_ip.tcl XILINX_DEPS += axi_clock_monitor_ip.tcl
INTEL_DEPS += ../intel/common/up_clock_mon_constr.sdc INTEL_DEPS += ../intel/common/up_clock_mon_constr.sdc

48
library/axi_clock_monitor/axi_clock_monitor.v
View File

@ -87,7 +87,7 @@ module axi_clock_monitor #(
// local parameters // local parameters
localparam PCORE_VERSION = 1 localparam PCORE_VERSION = 1;
// internal registers // internal registers
@ -111,11 +111,11 @@ module axi_clock_monitor #(
wire [20:0] clk_mon_count [0:15]; wire [20:0] clk_mon_count [0:15];
wire up_wreq_i_s; wire up_wreq_i_s;
wire [(PROC_ADDR_WD-1):0] up_waddr_i_s; wire [13:0] up_waddr_i_s;
wire [31:0] up_wdata_i_s; wire [31:0] up_wdata_i_s;
wire up_wack_o_s; wire up_wack_o_s;
wire up_rreq_i_s; wire up_rreq_i_s;
wire [(PROC_ADDR_WD-1):0] up_raddr_i_s; wire [13:0] up_raddr_i_s;
wire [31:0] up_rdata_o_s; wire [31:0] up_rdata_o_s;
wire up_rack_o_s; wire up_rack_o_s;
@ -184,30 +184,30 @@ module axi_clock_monitor #(
if (up_rreq_s == 1'b1) begin if (up_rreq_s == 1'b1) begin
case (up_raddr_i_s) case (up_raddr_i_s)
/* Standard registers */ /* Standard registers */
12'h000: up_rdata_int <= PCORE_VERSION; 14'h000: up_rdata_int <= PCORE_VERSION;
12'h001: up_rdata_int <= ID; 14'h001: up_rdata_int <= ID;
/* Core configuration */ /* Core configuration */
12'h003: up_rdata_int <= NUM_OF_CLOCKS; 14'h003: up_rdata_int <= NUM_OF_CLOCKS;
12'h004: up_rdata_int <= up_reset_core; 14'h004: up_rdata_int <= {31'h00, up_reset_core};
/* Clock ratios registers*/ /* Clock ratios registers*/
12'h010: up_rdata_int <= {11'h00, clk_mon_count[ 0]}; /* Make it 16.16 */ 14'h010: up_rdata_int <= {11'h00, clk_mon_count[ 0]};
12'h011: up_rdata_int <= {11'h00, clk_mon_count[ 1]}; /* Make it 16.16 */ 14'h011: up_rdata_int <= {11'h00, clk_mon_count[ 1]};
12'h012: up_rdata_int <= {11'h00, clk_mon_count[ 2]}; /* Make it 16.16 */ 14'h012: up_rdata_int <= {11'h00, clk_mon_count[ 2]};
12'h013: up_rdata_int <= {11'h00, clk_mon_count[ 3]}; /* Make it 16.16 */ 14'h013: up_rdata_int <= {11'h00, clk_mon_count[ 3]};
12'h014: up_rdata_int <= {11'h00, clk_mon_count[ 4]}; /* Make it 16.16 */ 14'h014: up_rdata_int <= {11'h00, clk_mon_count[ 4]};
12'h015: up_rdata_int <= {11'h00, clk_mon_count[ 5]}; /* Make it 16.16 */ 14'h015: up_rdata_int <= {11'h00, clk_mon_count[ 5]};
12'h016: up_rdata_int <= {11'h00, clk_mon_count[ 6]}; /* Make it 16.16 */ 14'h016: up_rdata_int <= {11'h00, clk_mon_count[ 6]};
12'h017: up_rdata_int <= {11'h00, clk_mon_count[ 7]}; /* Make it 16.16 */ 14'h017: up_rdata_int <= {11'h00, clk_mon_count[ 7]};
12'h018: up_rdata_int <= {11'h00, clk_mon_count[ 8]}; /* Make it 16.16 */ 14'h018: up_rdata_int <= {11'h00, clk_mon_count[ 8]};
12'h019: up_rdata_int <= {11'h00, clk_mon_count[ 9]}; /* Make it 16.16 */ 14'h019: up_rdata_int <= {11'h00, clk_mon_count[ 9]};
12'h01a: up_rdata_int <= {11'h00, clk_mon_count[10]}; /* Make it 16.16 */ 14'h01a: up_rdata_int <= {11'h00, clk_mon_count[10]};
12'h01b: up_rdata_int <= {11'h00, clk_mon_count[11]}; /* Make it 16.16 */ 14'h01b: up_rdata_int <= {11'h00, clk_mon_count[11]};
12'h01c: up_rdata_int <= {11'h00, clk_mon_count[12]}; /* Make it 16.16 */ 14'h01c: up_rdata_int <= {11'h00, clk_mon_count[12]};
12'h01d: up_rdata_int <= {11'h00, clk_mon_count[13]}; /* Make it 16.16 */ 14'h01d: up_rdata_int <= {11'h00, clk_mon_count[13]};
12'h01e: up_rdata_int <= {11'h00, clk_mon_count[14]}; /* Make it 16.16 */ 14'h01e: up_rdata_int <= {11'h00, clk_mon_count[14]};
12'h01f: up_rdata_int <= {11'h00, clk_mon_count[15]}; /* Make it 16.16 */ 14'h01f: up_rdata_int <= {11'h00, clk_mon_count[15]};
default: up_rdata_int <= 'h00; default: up_rdata_int <= 'h00;
endcase endcase
@ -230,7 +230,7 @@ module axi_clock_monitor #(
); );
end end
for (n = NUM_OF_CLOCKS; n < 16; n = n + 1) begin: clk_mon_z for (n = NUM_OF_CLOCKS; n < 16; n = n + 1) begin: clk_mon_z
assign clk_mon_count[n] = 20'd0; assign clk_mon_count[n] = 21'd0;
end end
endgenerate endgenerate

4
library/axi_clock_monitor/axi_clock_monitor_ip.tcl
View File

@ -7,8 +7,8 @@ adi_ip_create axi_clock_monitor
adi_ip_files axi_clock_monitor [list \ adi_ip_files axi_clock_monitor [list \
"$ad_hdl_dir/library/common/up_axi.v" \ "$ad_hdl_dir/library/common/up_axi.v" \
"$ad_hdl_dir/library/common/up_clock_mon.v" \ "$ad_hdl_dir/library/common/up_clock_mon.v" \
"axi_clock_monitor.v" \ "$ad_hdl_dir/library/xilinx/common/up_clock_mon_constr.xdc" \
"axi_clock_monitor_constr.xdc" ] "axi_clock_monitor.v" ]
adi_ip_properties axi_clock_monitor adi_ip_properties axi_clock_monitor