From f3b18ead59ae02f95dabbf0a1dea40873a816975 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 21 Jan 2024 06:23:46 -0600
Subject: rtl: refactor filenames and directory hierarchy

---
 rtl/perf/link.sv       | 181 -------------------------------------------------
 rtl/perf/perf_link.sv  | 181 +++++++++++++++++++++++++++++++++++++++++++++++++
 rtl/perf/perf_snoop.sv | 129 +++++++++++++++++++++++++++++++++++
 rtl/perf/snoop.sv      | 129 -----------------------------------
 4 files changed, 310 insertions(+), 310 deletions(-)
 delete mode 100644 rtl/perf/link.sv
 create mode 100644 rtl/perf/perf_link.sv
 create mode 100644 rtl/perf/perf_snoop.sv
 delete mode 100644 rtl/perf/snoop.sv

(limited to 'rtl/perf')

diff --git a/rtl/perf/link.sv b/rtl/perf/link.sv
deleted file mode 100644
index 323af45..0000000
--- a/rtl/perf/link.sv
+++ /dev/null
@@ -1,181 +0,0 @@
-`include "cache/defs.sv"
-
-module perf_link
-(
-	input  logic      clk,
-	                  rst_n,
-
-	input  logic      in_left_valid,
-	input  ring_req   in_left,
-	output logic      in_left_ready,
-
-	input  logic      in_right_valid,
-	input  ring_req   in_right,
-	input  logic      in_right_ready,
-
-	input  logic      out_left_ready,
-	output ring_req   out_left,
-	output logic      out_left_valid,
-
-	input  line_ptr   local_address,
-	input  logic      local_read,
-	                  local_write,
-	input  line       local_writedata,
-	input  line_be    local_byteenable,
-	output logic      local_waitrequest,
-	output line       local_readdata,
-
-	input  logic      mem_waitrequest,
-	input  line       mem_readdata,
-	output word       mem_address,
-	output logic      mem_read,
-	                  mem_write,
-	output line       mem_writedata,
-	output line_be    mem_byteenable,
-
-	input  logic      clear,
-	input  logic[3:0] address,
-	output word       readdata
-);
-
-	logic snoop_left_ready, snoop_left_valid, snoop_right_ready, snoop_right_valid,
-	      snoop_read, snoop_write, snoop_waitrequest, cached;
-
-	addr_bits snoop_addr_bits;
-	perf_sample snoop_left, snoop_right;
-
-	word reads, writes, ring_reads, ring_invals, ring_read_invals, ring_replies, ring_forwards,
-	     io_reads, io_writes, snoop_address;
-
-	hword mem_cycles, mem_cycles_hold, ring_cycles, min_ring_cycles, max_ring_cycles,
-	      min_read_cycles, max_read_cycles, min_write_cycles, max_write_cycles;
-
-	perf_snoop snoop
-	(
-		.*
-	);
-
-	assign cached = snoop_addr_bits.io == `IO_CACHED;
-	assign mem_cycles = mem_cycles_hold + 1;
-	assign snoop_addr_bits = snoop_address;
-
-	always_comb
-		if (!address[3]) unique case (address[2:0])
-			3'b000: readdata = reads;
-			3'b001: readdata = writes;
-			3'b010: readdata = {max_read_cycles, min_read_cycles};
-			3'b011: readdata = {max_write_cycles, min_write_cycles};
-			3'b100: readdata = ring_reads;
-			3'b101: readdata = ring_invals;
-			3'b110: readdata = ring_read_invals;
-			3'b111: readdata = ring_replies;
-		endcase else unique case (address[1:0])
-			2'b00:  readdata = ring_forwards;
-			2'b01:  readdata = {max_ring_cycles, min_ring_cycles};
-			2'b10:  readdata = io_reads;
-			2'b11:  readdata = io_writes;
-		endcase
-
-	always @(posedge clk or negedge rst_n)
-		if (!rst_n) begin
-			reads <= 0;
-			writes <= 0;
-			io_reads <= 0;
-			io_writes <= 0;
-
-			min_ring_cycles <= 0;
-			max_ring_cycles <= 0;
-			min_read_cycles <= 0;
-			max_read_cycles <= 0;
-			min_write_cycles <= 0;
-			max_write_cycles <= 0;
-
-			ring_reads <= 0;
-			ring_invals <= 0;
-			ring_replies <= 0;
-			ring_forwards <= 0;
-			ring_read_invals <= 0;
-
-			mem_cycles_hold <= 0;
-		end else begin
-			ring_cycles <= ring_cycles + 1;
-
-			if (mem_read || mem_write)
-				mem_cycles_hold <= mem_cycles;
-
-			if ((mem_read || mem_write) && !mem_waitrequest) begin
-				mem_cycles_hold <= 0;
-
-				if (!cached) begin
-					if (mem_write)
-						io_writes <= io_writes + 1;
-					else
-						io_reads <= io_reads + 1;
-				end else if (mem_write) begin
-					writes <= writes + 1;
-
-					if (min_write_cycles == 0 || mem_cycles_hold < min_write_cycles)
-						min_write_cycles <= mem_cycles;
-
-					if (mem_cycles_hold >= max_write_cycles)
-						max_write_cycles <= mem_cycles;
-				end else begin
-					reads <= reads + 1;
-
-					if (min_read_cycles == 0 || mem_cycles_hold < min_read_cycles)
-						min_read_cycles <= mem_cycles;
-
-					if (mem_cycles_hold >= max_read_cycles)
-						max_read_cycles <= mem_cycles;
-				end
-			end
-
-			if (snoop_left_valid && snoop_left_ready && snoop_left.ttl == `TTL_END) begin
-				if (snoop_left.reply)
-					ring_replies <= ring_replies + 1;
-
-				if (min_ring_cycles == 0 || ring_cycles < min_ring_cycles)
-					min_ring_cycles <= ring_cycles;
-
-				if (ring_cycles > max_ring_cycles)
-					max_ring_cycles <= ring_cycles;
-			end
-
-			if (snoop_right_valid && snoop_right_ready) begin
-				if (snoop_right.ttl == `TTL_MAX) begin
-					ring_cycles <= 1;
-
-					if (snoop_right.read && !snoop_right.inval)
-						ring_reads <= ring_reads + 1;
-
-					if (!snoop_right.read && snoop_right.inval)
-						ring_invals <= ring_invals + 1;
-
-					if (snoop_right.read && snoop_right.inval)
-						ring_read_invals <= ring_read_invals + 1;
-				end else
-					ring_forwards <= ring_forwards + 1;
-			end
-
-			if (clear) begin
-				reads <= 0;
-				writes <= 0;
-				io_reads <= 0;
-				io_writes <= 0;
-
-				min_ring_cycles <= 0;
-				max_ring_cycles <= 0;
-				min_read_cycles <= 0;
-				max_read_cycles <= 0;
-				min_write_cycles <= 0;
-				max_write_cycles <= 0;
-
-				ring_reads <= 0;
-				ring_invals <= 0;
-				ring_replies <= 0;
-				ring_forwards <= 0;
-				ring_read_invals <= 0;
-			end
-		end
-
-endmodule
diff --git a/rtl/perf/perf_link.sv b/rtl/perf/perf_link.sv
new file mode 100644
index 0000000..323af45
--- /dev/null
+++ b/rtl/perf/perf_link.sv
@@ -0,0 +1,181 @@
+`include "cache/defs.sv"
+
+module perf_link
+(
+	input  logic      clk,
+	                  rst_n,
+
+	input  logic      in_left_valid,
+	input  ring_req   in_left,
+	output logic      in_left_ready,
+
+	input  logic      in_right_valid,
+	input  ring_req   in_right,
+	input  logic      in_right_ready,
+
+	input  logic      out_left_ready,
+	output ring_req   out_left,
+	output logic      out_left_valid,
+
+	input  line_ptr   local_address,
+	input  logic      local_read,
+	                  local_write,
+	input  line       local_writedata,
+	input  line_be    local_byteenable,
+	output logic      local_waitrequest,
+	output line       local_readdata,
+
+	input  logic      mem_waitrequest,
+	input  line       mem_readdata,
+	output word       mem_address,
+	output logic      mem_read,
+	                  mem_write,
+	output line       mem_writedata,
+	output line_be    mem_byteenable,
+
+	input  logic      clear,
+	input  logic[3:0] address,
+	output word       readdata
+);
+
+	logic snoop_left_ready, snoop_left_valid, snoop_right_ready, snoop_right_valid,
+	      snoop_read, snoop_write, snoop_waitrequest, cached;
+
+	addr_bits snoop_addr_bits;
+	perf_sample snoop_left, snoop_right;
+
+	word reads, writes, ring_reads, ring_invals, ring_read_invals, ring_replies, ring_forwards,
+	     io_reads, io_writes, snoop_address;
+
+	hword mem_cycles, mem_cycles_hold, ring_cycles, min_ring_cycles, max_ring_cycles,
+	      min_read_cycles, max_read_cycles, min_write_cycles, max_write_cycles;
+
+	perf_snoop snoop
+	(
+		.*
+	);
+
+	assign cached = snoop_addr_bits.io == `IO_CACHED;
+	assign mem_cycles = mem_cycles_hold + 1;
+	assign snoop_addr_bits = snoop_address;
+
+	always_comb
+		if (!address[3]) unique case (address[2:0])
+			3'b000: readdata = reads;
+			3'b001: readdata = writes;
+			3'b010: readdata = {max_read_cycles, min_read_cycles};
+			3'b011: readdata = {max_write_cycles, min_write_cycles};
+			3'b100: readdata = ring_reads;
+			3'b101: readdata = ring_invals;
+			3'b110: readdata = ring_read_invals;
+			3'b111: readdata = ring_replies;
+		endcase else unique case (address[1:0])
+			2'b00:  readdata = ring_forwards;
+			2'b01:  readdata = {max_ring_cycles, min_ring_cycles};
+			2'b10:  readdata = io_reads;
+			2'b11:  readdata = io_writes;
+		endcase
+
+	always @(posedge clk or negedge rst_n)
+		if (!rst_n) begin
+			reads <= 0;
+			writes <= 0;
+			io_reads <= 0;
+			io_writes <= 0;
+
+			min_ring_cycles <= 0;
+			max_ring_cycles <= 0;
+			min_read_cycles <= 0;
+			max_read_cycles <= 0;
+			min_write_cycles <= 0;
+			max_write_cycles <= 0;
+
+			ring_reads <= 0;
+			ring_invals <= 0;
+			ring_replies <= 0;
+			ring_forwards <= 0;
+			ring_read_invals <= 0;
+
+			mem_cycles_hold <= 0;
+		end else begin
+			ring_cycles <= ring_cycles + 1;
+
+			if (mem_read || mem_write)
+				mem_cycles_hold <= mem_cycles;
+
+			if ((mem_read || mem_write) && !mem_waitrequest) begin
+				mem_cycles_hold <= 0;
+
+				if (!cached) begin
+					if (mem_write)
+						io_writes <= io_writes + 1;
+					else
+						io_reads <= io_reads + 1;
+				end else if (mem_write) begin
+					writes <= writes + 1;
+
+					if (min_write_cycles == 0 || mem_cycles_hold < min_write_cycles)
+						min_write_cycles <= mem_cycles;
+
+					if (mem_cycles_hold >= max_write_cycles)
+						max_write_cycles <= mem_cycles;
+				end else begin
+					reads <= reads + 1;
+
+					if (min_read_cycles == 0 || mem_cycles_hold < min_read_cycles)
+						min_read_cycles <= mem_cycles;
+
+					if (mem_cycles_hold >= max_read_cycles)
+						max_read_cycles <= mem_cycles;
+				end
+			end
+
+			if (snoop_left_valid && snoop_left_ready && snoop_left.ttl == `TTL_END) begin
+				if (snoop_left.reply)
+					ring_replies <= ring_replies + 1;
+
+				if (min_ring_cycles == 0 || ring_cycles < min_ring_cycles)
+					min_ring_cycles <= ring_cycles;
+
+				if (ring_cycles > max_ring_cycles)
+					max_ring_cycles <= ring_cycles;
+			end
+
+			if (snoop_right_valid && snoop_right_ready) begin
+				if (snoop_right.ttl == `TTL_MAX) begin
+					ring_cycles <= 1;
+
+					if (snoop_right.read && !snoop_right.inval)
+						ring_reads <= ring_reads + 1;
+
+					if (!snoop_right.read && snoop_right.inval)
+						ring_invals <= ring_invals + 1;
+
+					if (snoop_right.read && snoop_right.inval)
+						ring_read_invals <= ring_read_invals + 1;
+				end else
+					ring_forwards <= ring_forwards + 1;
+			end
+
+			if (clear) begin
+				reads <= 0;
+				writes <= 0;
+				io_reads <= 0;
+				io_writes <= 0;
+
+				min_ring_cycles <= 0;
+				max_ring_cycles <= 0;
+				min_read_cycles <= 0;
+				max_read_cycles <= 0;
+				min_write_cycles <= 0;
+				max_write_cycles <= 0;
+
+				ring_reads <= 0;
+				ring_invals <= 0;
+				ring_replies <= 0;
+				ring_forwards <= 0;
+				ring_read_invals <= 0;
+			end
+		end
+
+endmodule
diff --git a/rtl/perf/perf_snoop.sv b/rtl/perf/perf_snoop.sv
new file mode 100644
index 0000000..e98153e
--- /dev/null
+++ b/rtl/perf/perf_snoop.sv
@@ -0,0 +1,129 @@
+`include "cache/defs.sv"
+
+module perf_snoop
+(
+	input  logic       clk,
+	                   rst_n,
+
+	input  logic       in_left_valid,
+	input  ring_req    in_left,
+	output logic       in_left_ready,
+
+	input  logic       out_left_ready,
+	output ring_req    out_left,
+	output logic       out_left_valid,
+
+	input  logic       in_right_valid,
+	input  ring_req    in_right,
+	input  logic       in_right_ready,
+
+	input  line_ptr    local_address,
+	input  logic       local_read,
+	                   local_write,
+	input  line        local_writedata,
+	input  line_be     local_byteenable,
+	output logic       local_waitrequest,
+	output line        local_readdata,
+
+	input  logic       mem_waitrequest,
+	input  line        mem_readdata,
+	output word        mem_address,
+	output logic       mem_read,
+	                   mem_write,
+	output line        mem_writedata,
+	output line_be     mem_byteenable,
+
+	output logic       snoop_left_ready,
+	                   snoop_left_valid,
+	                   snoop_right_ready,
+	                   snoop_right_valid,
+	                   snoop_read,
+	                   snoop_write,
+	                   snoop_waitrequest,
+	output word        snoop_address,
+	output perf_sample snoop_left,
+	                   snoop_right
+);
+
+	word hold_address;
+	logic hold_left_ready, hold_left_valid, hold_right_ready, hold_right_valid,
+	      hold_read, hold_write, hold_waitrequest;
+
+	perf_sample hold_left, hold_right;
+
+	// out_right es driveado por las mismas líneas debido al anillo
+	assign in_left_ready = out_left_ready;
+	assign out_left = in_left;
+	assign out_left_valid = in_left_valid;
+
+	assign mem_read = local_read;
+	assign mem_write = local_write;
+	assign mem_address = {local_address, 4'b0000};
+	assign mem_writedata = local_writedata;
+	assign mem_byteenable = local_byteenable;
+	assign local_readdata = mem_readdata;
+	assign local_waitrequest = mem_waitrequest;
+
+	always @(posedge clk or negedge rst_n)
+		if (!rst_n) begin
+			hold_read <= 0;
+			hold_write <= 0;
+			hold_waitrequest <= 0;
+
+			hold_left_ready <= 0;
+			hold_left_valid <= 0;
+			hold_right_ready <= 0;
+			hold_right_valid <= 0;
+
+			snoop_read <= 0;
+			snoop_write <= 0;
+			snoop_waitrequest <= 0;
+
+			snoop_left_ready <= 0;
+			snoop_left_valid <= 0;
+			snoop_right_ready <= 0;
+			snoop_right_valid <= 0;
+		end else begin
+			/* La idea aquí es aligerar el trabajo del fitter, ya que perf_monitor
+			 * muestrea el anillo completo, por lo que su span de área es
+			 * potencialmente grande.
+			 */
+
+			hold_read <= mem_read;
+			hold_write <= mem_write;
+			hold_waitrequest <= mem_waitrequest;
+
+			hold_left_ready <= in_left_ready;
+			hold_left_valid <= in_left_valid;
+			hold_right_ready <= in_right_ready;
+			hold_right_valid <= in_right_valid;
+
+			snoop_read <= hold_read;
+			snoop_write <= hold_write;
+			snoop_waitrequest <= hold_waitrequest;
+
+			snoop_left_ready <= hold_left_ready;
+			snoop_left_valid <= hold_left_valid;
+			snoop_right_ready <= hold_right_ready;
+			snoop_right_valid <= hold_right_valid;
+		end
+
+	always @(posedge clk) begin
+		hold_left.ttl <= in_left.ttl;
+		hold_left.read <= in_left.read;
+		hold_left.inval <= in_left.inval;
+		hold_left.reply <= in_left.reply;
+
+		hold_right.ttl <= in_right.ttl;
+		hold_right.read <= in_right.read;
+		hold_right.inval <= in_right.inval;
+		hold_right.reply <= in_right.reply;
+
+		snoop_left <= hold_left;
+		snoop_right <= hold_right;
+
+		hold_address <= mem_address;
+		snoop_address <= hold_address;
+	end
+
+endmodule
diff --git a/rtl/perf/snoop.sv b/rtl/perf/snoop.sv
deleted file mode 100644
index e98153e..0000000
--- a/rtl/perf/snoop.sv
+++ /dev/null
@@ -1,129 +0,0 @@
-`include "cache/defs.sv"
-
-module perf_snoop
-(
-	input  logic       clk,
-	                   rst_n,
-
-	input  logic       in_left_valid,
-	input  ring_req    in_left,
-	output logic       in_left_ready,
-
-	input  logic       out_left_ready,
-	output ring_req    out_left,
-	output logic       out_left_valid,
-
-	input  logic       in_right_valid,
-	input  ring_req    in_right,
-	input  logic       in_right_ready,
-
-	input  line_ptr    local_address,
-	input  logic       local_read,
-	                   local_write,
-	input  line        local_writedata,
-	input  line_be     local_byteenable,
-	output logic       local_waitrequest,
-	output line        local_readdata,
-
-	input  logic       mem_waitrequest,
-	input  line        mem_readdata,
-	output word        mem_address,
-	output logic       mem_read,
-	                   mem_write,
-	output line        mem_writedata,
-	output line_be     mem_byteenable,
-
-	output logic       snoop_left_ready,
-	                   snoop_left_valid,
-	                   snoop_right_ready,
-	                   snoop_right_valid,
-	                   snoop_read,
-	                   snoop_write,
-	                   snoop_waitrequest,
-	output word        snoop_address,
-	output perf_sample snoop_left,
-	                   snoop_right
-);
-
-	word hold_address;
-	logic hold_left_ready, hold_left_valid, hold_right_ready, hold_right_valid,
-	      hold_read, hold_write, hold_waitrequest;
-
-	perf_sample hold_left, hold_right;
-
-	// out_right es driveado por las mismas líneas debido al anillo
-	assign in_left_ready = out_left_ready;
-	assign out_left = in_left;
-	assign out_left_valid = in_left_valid;
-
-	assign mem_read = local_read;
-	assign mem_write = local_write;
-	assign mem_address = {local_address, 4'b0000};
-	assign mem_writedata = local_writedata;
-	assign mem_byteenable = local_byteenable;
-	assign local_readdata = mem_readdata;
-	assign local_waitrequest = mem_waitrequest;
-
-	always @(posedge clk or negedge rst_n)
-		if (!rst_n) begin
-			hold_read <= 0;
-			hold_write <= 0;
-			hold_waitrequest <= 0;
-
-			hold_left_ready <= 0;
-			hold_left_valid <= 0;
-			hold_right_ready <= 0;
-			hold_right_valid <= 0;
-
-			snoop_read <= 0;
-			snoop_write <= 0;
-			snoop_waitrequest <= 0;
-
-			snoop_left_ready <= 0;
-			snoop_left_valid <= 0;
-			snoop_right_ready <= 0;
-			snoop_right_valid <= 0;
-		end else begin
-			/* La idea aquí es aligerar el trabajo del fitter, ya que perf_monitor
-			 * muestrea el anillo completo, por lo que su span de área es
-			 * potencialmente grande.
-			 */
-
-			hold_read <= mem_read;
-			hold_write <= mem_write;
-			hold_waitrequest <= mem_waitrequest;
-
-			hold_left_ready <= in_left_ready;
-			hold_left_valid <= in_left_valid;
-			hold_right_ready <= in_right_ready;
-			hold_right_valid <= in_right_valid;
-
-			snoop_read <= hold_read;
-			snoop_write <= hold_write;
-			snoop_waitrequest <= hold_waitrequest;
-
-			snoop_left_ready <= hold_left_ready;
-			snoop_left_valid <= hold_left_valid;
-			snoop_right_ready <= hold_right_ready;
-			snoop_right_valid <= hold_right_valid;
-		end
-
-	always @(posedge clk) begin
-		hold_left.ttl <= in_left.ttl;
-		hold_left.read <= in_left.read;
-		hold_left.inval <= in_left.inval;
-		hold_left.reply <= in_left.reply;
-
-		hold_right.ttl <= in_right.ttl;
-		hold_right.read <= in_right.read;
-		hold_right.inval <= in_right.inval;
-		hold_right.reply <= in_right.reply;
-
-		snoop_left <= hold_left;
-		snoop_right <= hold_right;
-
-		hold_address <= mem_address;
-		snoop_address <= hold_address;
-	end
-
-endmodule
-- 
cgit v1.2.3