cleanup

yhx · Jun 7, 2016 · 5b49941 · 5b49941
1 parent 2e800e5
commit 5b49941
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 310 deletions.
diff --git a/RTL/ll_ccie/afu_user.v → RTL/ll_ccie/back/afu_user.v b/RTL/ll_ccie/afu_user.v → RTL/ll_ccie/back/afu_user.v
diff --git a/RTL/ll_ccie/utils/afu_user2.v → RTL/ll_ccie/back/afu_user2.v b/RTL/ll_ccie/utils/afu_user2.v → RTL/ll_ccie/back/afu_user2.v
diff --git a/RTL/ll_ccie/utils/afu_user_test.v → RTL/ll_ccie/back/afu_user_test.v b/RTL/ll_ccie/utils/afu_user_test.v → RTL/ll_ccie/back/afu_user_test.v
diff --git a/RTL/ll_ccie/utils/afu_user_wb_mat.v → RTL/ll_ccie/back/afu_user_wb_mat.v b/RTL/ll_ccie/utils/afu_user_wb_mat.v → RTL/ll_ccie/back/afu_user_wb_mat.v
diff --git a/RTL/ll_ccie/array_accu_pl.v → RTL/ll_ccie/back/array_accu_pl.v b/RTL/ll_ccie/array_accu_pl.v → RTL/ll_ccie/back/array_accu_pl.v
diff --git a/RTL/ll_ccie/array_add_pl.v → RTL/ll_ccie/back/array_add_pl.v b/RTL/ll_ccie/array_add_pl.v → RTL/ll_ccie/back/array_add_pl.v
diff --git a/RTL/ll_ccie/array_mul.v → RTL/ll_ccie/back/array_mul.v b/RTL/ll_ccie/array_mul.v → RTL/ll_ccie/back/array_mul.v
diff --git a/RTL/ll_ccie/utils/array_mul8.v → RTL/ll_ccie/back/array_mul8.v b/RTL/ll_ccie/utils/array_mul8.v → RTL/ll_ccie/back/array_mul8.v
diff --git a/RTL/ll_ccie/clock_divider.v → RTL/ll_ccie/back/clock_divider.v b/RTL/ll_ccie/clock_divider.v → RTL/ll_ccie/back/clock_divider.v
diff --git a/RTL/ll_ccie/matrix_multiply.v → RTL/ll_ccie/back/matrix_multiply.v b/RTL/ll_ccie/matrix_multiply.v → RTL/ll_ccie/back/matrix_multiply.v
diff --git a/RTL/ll_ccie/matrix_multiply_pl.v → RTL/ll_ccie/back/matrix_multiply_pl.v b/RTL/ll_ccie/matrix_multiply_pl.v → RTL/ll_ccie/back/matrix_multiply_pl.v
diff --git a/RTL/ll_ccie/cycle_detection_pe.v b/RTL/ll_ccie/cycle_detection_pe.v
diff --git a/RTL/ll_ccie/fifo.v b/RTL/ll_ccie/fifo.v
diff --git a/RTL/ll_ccie/matrix_multiply_buf_pl.v b/RTL/ll_ccie/matrix_multiply_buf_pl.v
@@ -78,35 +78,32 @@ module matrix_multiply_buf_pl #(ADDR_LMT = 20, MDATA = 14, CACHE_WIDTH = 512, DA
 
 	reg [3:0] 		r_state, n_state;
 
-	wire 			run, accu_run;
+	wire 			run;
 	assign run = (r_state == STATE_RUN) && (!r_done);
-	assign accu_run = (r_state == STATE_ADDUP) && (!r_done);
 
 	//Perf manage
 	reg [DATA_WIDTH-1:0] perf_cnt;
 	reg [DATA_WIDTH-1:0] perf_start;
 
 	// Base address
-	reg [ADDR_LMT-1:0] addr_vec2;
-	reg [ADDR_LMT-1:0] addr_wr_base;
+	wire [ADDR_LMT-1:0] addr_vec2;
+	wire [ADDR_LMT-1:0] addr_wr_base;
 
 
 	// INIT parameter
 	reg [CACHE_WIDTH-1:0] para, n_para;
 
-	wire [DATA_WIDTH-1:0] M;
-	wire [DATA_WIDTH-1:0] N;
-	wire [DATA_WIDTH-1:0] P;
-	wire [DATA_WIDTH-1:0] MN;
-	wire [DATA_WIDTH-1:0] MP;
-	wire [DATA_WIDTH-1:0] PN;
-	wire [DATA_WIDTH-1:0] BN;
-	assign M = para[31:0];
-	assign N = para[63:32];
-	assign P = para[95:64];
+	wire [ADDR_LMT-1:0] M;
+	wire [ADDR_LMT-1:0] N;
+	wire [ADDR_LMT-1:0] P;
+	wire [ADDR_LMT-1:0] MN;
+	wire [ADDR_LMT-1:0] MP;
+	wire [ADDR_LMT-1:0] PN;
+	assign M = para[ADDR_LMT-1:0];
+	assign N = para[DATA_WIDTH + ADDR_LMT-1:DATA_WIDTH];
+	assign P = para[DATA_WIDTH + DATA_WIDTH + ADDR_LMT-1: DATA_WIDTH+DATA_WIDTH];
 	assign MN = M * N;
 	assign PN = P * N;
-	assign BN = RAM_DEPTH/N;
 	assign MP = M * P;
 	assign addr_vec2 = addr_vec1 + MN;
 	assign addr_wr_base = ((MN + PN + 1)<<4);
@@ -152,7 +149,7 @@ module matrix_multiply_buf_pl #(ADDR_LMT = 20, MDATA = 14, CACHE_WIDTH = 512, DA
 	accuer (
 		.clk (clk),
 		.rst (rst),
-		.size_out (N),
+		.size_out ({12'd0, N}),
 		.inc (ready_mul),
 		.array (res_mul),
 		.res	(res_accu),

diff --git a/RTL/ll_ccie/write_buffer_pl.v b/RTL/ll_ccie/write_buffer_pl.v
@@ -109,7 +109,7 @@ module write_buffer_pl #(ADDR_LMT = 20, MDATA = 14, CACHE_WIDTH = 512, DATA_WIDT
 
 			buffer[index_addr +: 32] <= wr_en ? wr_data[31:0] : buffer[index_addr +: 32];
 			cur_addr <= wr_en ? cl_addr : cur_addr;
-			buf_mdata <= wr_en ? wr_mdata : 'd0;
+			buf_mdata <= wr_en ? wr_mdata : 14'd0;
 
 			if (wr_real)
 			begin

diff --git a/SW/matrix_mul b/SW/matrix_mul
diff --git a/SW/matrix_mul.cpp b/SW/matrix_mul.cpp
@@ -438,7 +438,7 @@ int matrixMulApp::run()
 		int *ptr = (int*)pSource;
 		//INIT
 		FILE *f = NULL;
-		const int M = 240, N = 15, P = 5;
+		const int M = 24, N = 2, P = 15;
 		const int M_ = ((M+15)>>4)<<4;
 		ptr[0] = M;
 		ptr[1] = N;