From 4aa04e76e6c45fba9e8711c64a72929711312592 Mon Sep 17 00:00:00 2001
From: felsabbagh3 <felsabbagh3@gatech.edu>
Date: Tue, 29 Oct 2019 14:28:20 -0400
Subject: [PATCH] Simulate debug

---
 kernel/vortex_test.dump                       |   6 +-
 kernel/vortex_test.elf                        | Bin 15724 -> 15724 bytes
 kernel/vortex_test.hex                        |   2 +-
 kernel/vx_os/vx_back/vx_back.s                |  15 ++-
 .../cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v  |   2 +
 .../cln28hpm/rf2_32x128_wm1/vsim/Makefile     |  36 +++++++
 .../rf2_32x128_wm1/vsim/rf2_32x128_wm1_tb.v   |  89 ++++++++++++++++++
 .../cln28hpm/rf2_32x128_wm1/vsim/transcript   |  26 +++++
 rtl/VX_define.v                               |   2 +-
 rtl/VX_gpr.v                                  |  86 ++++++++++++-----
 rtl/modelsim/Makefile                         |   9 +-
 rtl/modelsim/vortex_tb.v                      |   2 +-
 12 files changed, 242 insertions(+), 33 deletions(-)
 create mode 100644 models/memory/cln28hpm/rf2_32x128_wm1/vsim/Makefile
 create mode 100644 models/memory/cln28hpm/rf2_32x128_wm1/vsim/rf2_32x128_wm1_tb.v
 create mode 100644 models/memory/cln28hpm/rf2_32x128_wm1/vsim/transcript

diff --git a/kernel/vortex_test.dump b/kernel/vortex_test.dump
index 179caf03..db0311f7 100644
--- a/kernel/vortex_test.dump
+++ b/kernel/vortex_test.dump
@@ -5,8 +5,8 @@ vortex_test.elf:     file format elf32-littleriscv
 Disassembly of section .text:
 
 80000000 <_start>:
-80000000:	7ffff137          	lui	sp,0x7ffff
-80000004:	041010ef          	jal	ra,80001844 <main>
+80000000:	00400593          	li	a1,4
+80000004:	00b58633          	add	a2,a1,a1
 80000008:	00000513          	li	a0,0
 8000000c:	0005006b          	0x5006b
 
@@ -23,7 +23,7 @@ Disassembly of section .text:
 80000024:	00755c63          	bge	a0,t2,8000003c <loop_done>
 
 80000028 <loop_body>:
-80000028:	80010113          	addi	sp,sp,-2048 # 7fffe800 <SIZE+0x7fffe7ce>
+80000028:	80010113          	addi	sp,sp,-2048
 8000002c:	00050313          	mv	t1,a0
 80000030:	0003506b          	0x3506b
 
diff --git a/kernel/vortex_test.elf b/kernel/vortex_test.elf
index bb4ed67c567009fea0301a84b3d4521728180af1..7bb309b63fe2807bf9e3dc335c698409795ad1ea 100755
GIT binary patch
delta 54
zcmaD;^`>fp0LNrj2L|J|tqhwv1avjnvK=e)1B@nHTQsuyXBKBWSx!D=5x^E$Sy^cs
KwOPV4garT!<q|Id

delta 54
zcmaD;^`>fp0EhX<|Ml+$1Xwn62<U3Cc^H-l<{3}6wrFI_&vG*kwwQd#B7m(Zq%6xR
Ke6xgQ2nzs1aT6{8

diff --git a/kernel/vortex_test.hex b/kernel/vortex_test.hex
index f40c918e..2f2c2f12 100644
--- a/kernel/vortex_test.hex
+++ b/kernel/vortex_test.hex
@@ -1,5 +1,5 @@
 :0200000480007A
-:1000000037F1FF7FEF101004130500006B000500AF
+:10000000930540003386B500130500006B00050022
 :10001000938B0600130D0700130F010093030500D7
 :1000200013051000635C75001301018013030500C4
 :100030006B500300130515006FF0DFFE1300000086
diff --git a/kernel/vx_os/vx_back/vx_back.s b/kernel/vx_os/vx_back/vx_back.s
index 7e96befa..3c8fc894 100644
--- a/kernel/vx_os/vx_back/vx_back.s
+++ b/kernel/vx_os/vx_back/vx_back.s
@@ -6,6 +6,11 @@
 .type _start, @function
 .global _start
 _start:
+    li a1, 4
+    add a2, a1, a1
+    li a0, 0
+    .word 0x0005006b    # tmc a0
+    ###########################
       # la a0, 0x10000000
       # li a1, 7
       # sw a1, 0(a0)
@@ -67,11 +72,11 @@ _start:
 #     .word 0x0000306b    #join
 #     ecall
     ############################
-    lui  sp, 0x7ffff
-    # jal  vx_before_main
-    jal  main
-    li a0, 0
-    .word 0x0005006b    # tmc a0
+    # lui  sp, 0x7ffff
+    # # jal  vx_before_main
+    # jal  main
+    # li a0, 0
+    # .word 0x0005006b    # tmc a0
 
 # Hi:
 #     li a2, 7
diff --git a/models/memory/cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v b/models/memory/cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v
index 4cd3879c..bd543e5a 100644
--- a/models/memory/cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v
+++ b/models/memory/cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v
@@ -47,6 +47,8 @@
 //
 //      Known Work Arounds: N/A
 //
+`define ARM_UD_MODEL
+
 `timescale 1 ns/1 ps
 `define ARM_MEM_PROP 1.000
 `define ARM_MEM_RETAIN 1.000
diff --git a/models/memory/cln28hpm/rf2_32x128_wm1/vsim/Makefile b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/Makefile
new file mode 100644
index 00000000..76f58c6e
--- /dev/null
+++ b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/Makefile
@@ -0,0 +1,36 @@
+
+
+ALL:sim
+
+#TOOL INPUT
+SRC = \
+rf2_32x128_wm1_tb.v \
+../rf2_32x128_wm1.v 
+
+
+
+CMD= \
+-do "vcd file rf2_32x128_wm1_tb.vcd; \
+	 vcd add -r /rf2_32x128_wm1_tb/*; \
+	 run -all; \
+	 quit -f"
+
+
+OPT=-sv -sv12compat
+
+LIB = rf_lib
+
+# LOG=-logfile rf2_32x128_wm1_tb.log
+LOG=
+
+comp:
+	vlog $(OPT) -work $(LIB) $(SRC)
+
+
+sim: comp
+	vsim rf2_32x128_wm1_tb $(LOG) -c -lib $(LIB) $(CMD)
+
+
+
+
+
diff --git a/models/memory/cln28hpm/rf2_32x128_wm1/vsim/rf2_32x128_wm1_tb.v b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/rf2_32x128_wm1_tb.v
new file mode 100644
index 00000000..105cc840
--- /dev/null
+++ b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/rf2_32x128_wm1_tb.v
@@ -0,0 +1,89 @@
+`timescale 1ns/1ps
+
+
+module rf2_32x128_wm1_tb (
+	output [127 : 0] out_a_reg_data,
+	output reg clk,
+	output reg [4 : 0] rs1,
+	output reg [127 : 0] write_bit_mask,
+	output reg [4 : 0] rd,
+	output reg [127 : 0] write_data,
+	output reg cena,
+	output reg cenb
+);
+
+	initial begin
+		clk <= 1'b0;
+		rs1 <= 5'b0;
+		write_bit_mask <= {128{1'b1}};
+		rd <= 5'b0;
+		write_data <= 128'b0;
+		cena <= 1'b1;
+		cenb <= 1'b1;
+
+
+		
+		#100
+		cenb <= 1'b0;
+		write_bit_mask <= {{96{1'b1}}, {32{1'b0}}};
+		rd <= 5'h0a;
+		write_data <= 128'h0000_0002_0000_0002_0000_0002_0000_0002;
+		#10
+		cenb <= 1'b1;
+		write_bit_mask <= {128{1'b1}};
+		rd <= 5'b0;
+		write_data <= 128'b0;
+		
+		#100
+		cena <= 1'b0;
+		rs1 <= 5'h0a;
+
+      #1000
+      $finish;
+
+
+	end
+
+	always @(clk) #5 clk <= ~clk;
+
+
+
+   rf2_32x128_wm1 first_ram (
+         .CENYA(),
+         .AYA(),
+         .CENYB(),
+         .WENYB(),
+         .AYB(),
+         .QA(out_a_reg_data),
+         .SOA(),
+         .SOB(),
+         .CLKA(clk),
+         .CENA(cena),
+         .AA(rs1),
+         .CLKB(clk),
+         .CENB(cenb),
+         .WENB(write_bit_mask),
+         .AB(rd),
+         .DB(write_data),
+         .EMAA(3'b011),
+         .EMASA(1'b0),
+         .EMAB(3'b011),
+         .TENA(1'b1),
+         .TCENA(1'b0),
+         .TAA(5'b0),
+         .TENB(1'b1),
+         .TCENB(1'b0),
+         .TWENB(128'b0),
+         .TAB(5'b0),
+         .TDB(128'b0),
+         .RET1N(1'b1),
+         .SIA(2'b0),
+         .SEA(1'b0),
+         .DFTRAMBYP(1'b0),
+         .SIB(2'b0),
+         .SEB(1'b0),
+         .COLLDISN(1'b1)
+   );
+
+endmodule 
+
diff --git a/models/memory/cln28hpm/rf2_32x128_wm1/vsim/transcript b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/transcript
new file mode 100644
index 00000000..fc080c23
--- /dev/null
+++ b/models/memory/cln28hpm/rf2_32x128_wm1/vsim/transcript
@@ -0,0 +1,26 @@
+# vsim rf2_32x128_wm1_tb -c -lib rf_lib -do "vcd file rf2_32x128_wm1_tb.vcd; vcd add -r /rf2_32x128_wm1_tb/*; run -all; quit -f" 
+# Start time: 13:02:14 on Oct 29,2019
+# ** Note: (vsim-3813) Design is being optimized due to module recompilation...
+# //  ModelSim SE-64 10.6a Mar 16 2017Linux 3.10.0-1062.1.2.el7.x86_64
+# //
+# //  Copyright 1991-2017 Mentor Graphics Corporation
+# //  All Rights Reserved.
+# //
+# //  ModelSim SE-64 and its associated documentation contain trade
+# //  secrets and commercial or financial information that are the property of
+# //  Mentor Graphics Corporation and are privileged, confidential,
+# //  and exempt from disclosure under the Freedom of Information Act,
+# //  5 U.S.C. Section 552. Furthermore, this information
+# //  is prohibited from disclosure under the Trade Secrets Act,
+# //  18 U.S.C. Section 1905.
+# //
+# Loading sv_std.std
+# Loading work.rf2_32x128_wm1_tb(fast)
+# Loading work.rf2_32x128_wm1(fast)
+# vcd file rf2_32x128_wm1_tb.vcd
+#  vcd add -r /rf2_32x128_wm1_tb/*
+#  run -all
+# ** Note: $finish    : rf2_32x128_wm1_tb.v(42)
+#    Time: 220 ns  Iteration: 0  Instance: /rf2_32x128_wm1_tb
+# End time: 13:02:16 on Oct 29,2019, Elapsed time: 0:00:02
+# Errors: 0, Warnings: 0
diff --git a/rtl/VX_define.v b/rtl/VX_define.v
index 826567a3..76b28823 100644
--- a/rtl/VX_define.v
+++ b/rtl/VX_define.v
@@ -9,7 +9,7 @@
 // Uncomment the below line if NW=1
 // `define ONLY
 
-`define SYN 1
+// `define SYN 1
 
 `define CACHE_NUM_BANKS 8
 
diff --git a/rtl/VX_gpr.v b/rtl/VX_gpr.v
index c906f4e4..a94ceae9 100644
--- a/rtl/VX_gpr.v
+++ b/rtl/VX_gpr.v
@@ -16,25 +16,43 @@ module VX_gpr (
 
 	wire write_enable;
 
-	assign write_enable = valid_write_request && ((VX_writeback_inter.wb != 0) && (VX_writeback_inter.rd != 5'h0));
+	assign write_enable = valid_write_request && ((VX_writeback_inter.wb != 0));
 	
 
-	`ifndef SYN
+	// `ifndef SYN
 
-		byte_enabled_simple_dual_port_ram first_ram(
-			.we    (write_enable),
-			.clk   (clk),
-			.reset (reset),
-			.waddr (VX_writeback_inter.rd),
-			.raddr1(VX_gpr_read.rs1),
-			.raddr2(VX_gpr_read.rs2),
-			.be    (VX_writeback_inter.wb_valid),
-			.wdata (VX_writeback_inter.write_data),
-			.q1    (out_a_reg_data),
-			.q2    (out_b_reg_data)
-		);
+	// 	byte_enabled_simple_dual_port_ram first_ram(
+	// 		.we    (write_enable),
+	// 		.clk   (clk),
+	// 		.reset (reset),
+	// 		.waddr (VX_writeback_inter.rd),
+	// 		.raddr1(VX_gpr_read.rs1),
+	// 		.raddr2(VX_gpr_read.rs2),
+	// 		.be    (VX_writeback_inter.wb_valid),
+	// 		.wdata (VX_writeback_inter.write_data),
+	// 		.q1    (out_a_reg_data),
+	// 		.q2    (out_b_reg_data)
+	// 	);
+
+	// `else 
+
+
+	wire writing_to_zero = (VX_writeback_inter.rd == 5'h0);
+
+
+		reg[31:0] use_before;
+		wire going_to_write = write_enable & (|VX_writeback_inter.wb_valid);
+
+
+		integer i;
+		always @(posedge clk) begin
+			if (reset) begin
+				use_before = 0;
+			end else if (going_to_write) begin
+				use_before[VX_writeback_inter.rd] = 1;
+			end
+		end
 
-	`else 
 		wire[`NT_M1:0][31:0] write_bit_mask;
 
 		genvar curr_t;
@@ -43,7 +61,6 @@ module VX_gpr (
 			assign write_bit_mask[curr_t] = {32{~local_write}};
 		end
 
-		wire going_to_write = write_enable & (|VX_writeback_inter.wb_valid);
 
 
 		wire cenb    = !going_to_write;
@@ -51,6 +68,33 @@ module VX_gpr (
 		wire cena_1  = (VX_gpr_read.rs1 == 0);
 		wire cena_2  = (VX_gpr_read.rs2 == 0);
 
+
+		wire[`NT_M1:0][31:0] temp_a;
+		wire[`NT_M1:0][31:0] temp_b;
+
+
+		`ifndef SYN
+			genvar thread;
+			genvar curr_bit;
+			for (thread = 0; thread < `NT; thread = thread + 1)
+			begin
+				for (curr_bit = 0; curr_bit < 32; curr_bit=curr_bit+1)
+				begin
+					assign out_a_reg_data[thread][curr_bit] = (temp_a[thread][curr_bit] === 1'dx) ? 1'b0 : temp_a[thread][curr_bit];
+					assign out_b_reg_data[thread][curr_bit] = (temp_b[thread][curr_bit] === 1'dx) ? 1'b0 : temp_b[thread][curr_bit];
+				end
+			end
+		`else
+			assign out_a_reg_data = (cena_1 | !use_before[VX_gpr_read.rs1]) ? 0 : temp_a;
+			assign out_b_reg_data = (cena_2 | !use_before[VX_gpr_read.rs2]) ? 0 : temp_b;
+		`endif
+
+
+		wire[`NT_M1:0][31:0] to_write = writing_to_zero ? 0 : VX_writeback_inter.write_data;
+
+		// wire cena_1  = 0;
+		// wire cena_2  = 0;
+
 		// wire[127:0] write_bit_mask = {{32{~(VX_writeback_inter.wb_valid[3])}}, {32{~(VX_writeback_inter.wb_valid[2])}}, {32{~(VX_writeback_inter.wb_valid[1])}}, {32{~(VX_writeback_inter.wb_valid[0])}}};
 		/* verilator lint_off PINCONNECTEMPTY */
 	   rf2_32x128_wm1 first_ram (
@@ -59,7 +103,7 @@ module VX_gpr (
 	         .CENYB(),
 	         .WENYB(),
 	         .AYB(),
-	         .QA(out_a_reg_data),
+	         .QA(temp_a),
 	         .SOA(),
 	         .SOB(),
 	         .CLKA(clk),
@@ -69,7 +113,7 @@ module VX_gpr (
 	         .CENB(cenb),
 	         .WENB(write_bit_mask),
 	         .AB(VX_writeback_inter.rd),
-	         .DB(VX_writeback_inter.write_data),
+	         .DB(to_write),
 	         .EMAA(3'b011),
 	         .EMASA(1'b0),
 	         .EMAB(3'b011),
@@ -98,7 +142,7 @@ module VX_gpr (
 	         .CENYB(),
 	         .WENYB(),
 	         .AYB(),
-	         .QA(out_b_reg_data),
+	         .QA(temp_b),
 	         .SOA(),
 	         .SOB(),
 	         .CLKA(clk),
@@ -108,7 +152,7 @@ module VX_gpr (
 	         .CENB(cenb),
 	         .WENB(write_bit_mask),
 	         .AB(VX_writeback_inter.rd),
-	         .DB(VX_writeback_inter.write_data),
+	         .DB(to_write),
 	         .EMAA(3'b011),
 	         .EMASA(1'b0),
 	         .EMAB(3'b011),
@@ -129,6 +173,6 @@ module VX_gpr (
 	         .COLLDISN(1'b1)
 	   );
 	   /* verilator lint_on PINCONNECTEMPTY */
-	`endif
+	// `endif
 
 endmodule
diff --git a/rtl/modelsim/Makefile b/rtl/modelsim/Makefile
index de34b026..9b628607 100644
--- a/rtl/modelsim/Makefile
+++ b/rtl/modelsim/Makefile
@@ -73,13 +73,20 @@ SRC = \
 ../shared_memory/VX_bank_valids.v \
 ../shared_memory/VX_priority_encoder_sm.v \
 ../shared_memory/VX_shared_memory.v \
-../shared_memory/VX_shared_memory_block.v
+../shared_memory/VX_shared_memory_block.v \
+../../models/memory/cln28hpm/rf2_128x128_wm1/rf2_128x128_wm1.v \
+../../models/memory/cln28hpm/rf2_256x128_wm1/rf2_256x128_wm1.v \
+../../models/memory/cln28hpm/rf2_256x19_wm0/rf2_256x19_wm0.v \
+../../models/memory/cln28hpm/rf2_32x128_wm1/rf2_32x128_wm1.v 
+# ../../models/memory/cln28hpc/rf2_32x128_wm1/rf2_32x128_wm1.v
+
 # vortex_dpi.h 
 
 
 CMD= \
 -do "vcd file vortex.vcd; \
 	 vcd add -r /vortex_tb/*; \
+	 vcd add -r /vortex/*; \
 	 run -all; \
 	 quit -f"
 
diff --git a/rtl/modelsim/vortex_tb.v b/rtl/modelsim/vortex_tb.v
index 6a9b06ff..24df426f 100644
--- a/rtl/modelsim/vortex_tb.v
+++ b/rtl/modelsim/vortex_tb.v
@@ -102,7 +102,7 @@ module vortex_tb (
 
 		if (out_ebreak) begin
 			gracefulExit();
-			$finish;
+			#20 $finish;
 		end
 
 	end