Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
zistvan-public
Caribou KVS with Privacy Perturbations
Commits
986a98dd
Commit
986a98dd
authored
Feb 25, 2019
by
Zsolt István
Browse files
added debug output to see how much memory has been allocated
parent
9c849df8
Changes
3
Hide whitespace changes
Inline
Side-by-side
hw/src/muu/muu_top_module_lmem.v
View file @
986a98dd
...
...
@@ -171,22 +171,22 @@ wire [39:0] upd_wrcmd_data;
wire
upd_wrcmd_ready
;
wire
[
15
:
0
]
mreq_data
;
wire
mreq_valid
;
wire
mreq_ready
;
(
*
mark_debug
=
"true"
*
)
wire
mreq_valid
;
(
*
mark_debug
=
"true"
*
)
wire
mreq_ready
;
wire
[
15
:
0
]
mreq_data_b
;
wire
mreq_valid_b
;
wire
mreq_ready_b
;
wire
[
31
:
0
]
malloc_data
;
wire
malloc_valid
;
wire
malloc_failed
;
wire
malloc_ready
;
(
*
mark_debug
=
"true"
*
)
wire
malloc_valid
;
(
*
mark_debug
=
"true"
*
)
wire
malloc_failed
;
(
*
mark_debug
=
"true"
*
)
wire
malloc_ready
;
wire
[
31
:
0
]
free_data
;
wire
[
15
:
0
]
free_size
;
wire
free_valid
;
wire
free_ready
;
(
*
mark_debug
=
"true"
*
)
wire
free_valid
;
(
*
mark_debug
=
"true"
*
)
wire
free_ready
;
wire
free_wipe
;
wire
[
31
:
0
]
malloc_data_b
;
...
...
@@ -204,17 +204,17 @@ wire free_wipe_b;
wire
[
63
:
0
]
key_data
;
wire
key_last
;
wire
key_valid
;
wire
key_ready
;
(
*
mark_debug
=
"true"
*
)
wire
key_valid
;
(
*
mark_debug
=
"true"
*
)
wire
key_ready
;
wire
[
EXT_META_WIDTH
-
1
:
0
]
meta_data
;
wire
meta_valid
;
wire
meta_ready
;
(
*
mark_debug
=
"true"
*
)
wire
meta_valid
;
(
*
mark_debug
=
"true"
*
)
wire
meta_ready
;
wire
[
USER_BITS
+
63
:
0
]
tohash_data
;
wire
tohash_valid
;
wire
tohash_ready
;
(
*
mark_debug
=
"true"
*
)
wire
tohash_valid
;
(
*
mark_debug
=
"true"
*
)
wire
tohash_ready
;
wire
[
1
+
63
:
0
]
tosm_data
;
wire
tosm_valid
;
...
...
@@ -261,20 +261,20 @@ wire keywhash_valid;
wire
keywhash_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
+
DOUBLEHASH_WIDTH
-
1
:
0
]
towrite_b_data
;
wire
towrite_b_valid
;
wire
towrite_b_ready
;
(
*
mark_debug
=
"true"
*
)
wire
towrite_b_valid
;
(
*
mark_debug
=
"true"
*
)
wire
towrite_b_ready
;
wire
[
16
+
KEY_WIDTH
+
EXT_META_WIDTH
+
HEADER_WIDTH
-
1
:
0
]
writeout_data
;
wire
writeout_valid
;
wire
writeout_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
+
HEADER_WIDTH
-
1
:
0
]
writeout_b_data
;
wire
writeout_b_valid
;
wire
writeout_b_ready
;
(
*
mark_debug
=
"true"
*
)
wire
writeout_b_valid
;
(
*
mark_debug
=
"true"
*
)
wire
writeout_b_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
+
HEADER_WIDTH
-
1
:
0
]
fromset_data
;
wire
fromset_valid
;
wire
fromset_ready
;
(
*
mark_debug
=
"true"
*
)
wire
fromset_valid
;
(
*
mark_debug
=
"true"
*
)
wire
fromset_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
+
HEADER_WIDTH
-
1
:
0
]
fromset_b_data
;
wire
fromset_b_valid
;
...
...
@@ -285,8 +285,8 @@ wire towrite_valid;
wire
towrite_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
-
1
:
0
]
writefb_data
;
wire
writefb_valid
;
wire
writefb_ready
;
(
*
mark_debug
=
"true"
*
)
wire
writefb_valid
;
(
*
mark_debug
=
"true"
*
)
wire
writefb_ready
;
wire
[
KEY_WIDTH
+
EXT_META_WIDTH
-
1
:
0
]
writefb_b_data
;
...
...
@@ -299,9 +299,9 @@ wire feedbwhash_ready;
wire
[
VALUE_WIDTH
-
1
:
0
]
value_data
;
wire
[
15
:
0
]
value_length
;
wire
value_last
;
wire
value_valid
;
wire
value_ready
;
(
*
mark_debug
=
"true"
*
)
wire
value_last
;
(
*
mark_debug
=
"true"
*
)
wire
value_valid
;
(
*
mark_debug
=
"true"
*
)
wire
value_ready
;
wire
value_almost_full
;
wire
[
VALUE_WIDTH
+
16
+
1
-
1
:
0
]
value_b_data
;
...
...
@@ -1323,6 +1323,8 @@ nukv_fifogen #(
wire
malloc_error_valid
;
wire
[
7
:
0
]
malloc_error_state
;
wire
[
31
:
0
]
malloc_stat_size
;
nukv_Malloc
#(
.
IS_SIM
(
IS_SIM
),
...
...
@@ -1396,7 +1398,10 @@ nukv_Malloc #(
.
scan_pause
(
SUPPORT_SCANS
==
1
?
scan_pause
:
0
),
.
error_memory
(
malloc_error_valid
),
.
error_state
(
malloc_error_state
)
.
error_state
(
malloc_error_state
),
.
stat_size
(
malloc_stat_size
)
);
assign
scan_mode_on
=
0
;
...
...
@@ -1835,7 +1840,9 @@ muu_Value_Get #(
.
output_ready
(
m_axis_tready
),
.
output_last
(
m_axis_tlast
),
.
scan_mode
(
scan_mode_on
)
.
scan_mode
(
scan_mode_on
),
.
malloc_stat_data
(
malloc_stat_size
)
);
...
...
hw/src/muu/muu_value_get.v
View file @
986a98dd
...
...
@@ -51,7 +51,9 @@ module muu_Value_Get #(
output
reg
output_last
,
input
wire
output_ready
,
input
wire
scan_mode
input
wire
scan_mode
,
input
wire
[
31
:
0
]
malloc_stat_data
);
...
...
@@ -350,7 +352,8 @@ always @(posedge clk) begin
cond_ready
<=
hasvalue
&
is_forme
;
output_valid
<=
1
;
output_word
<=
{
16'h0
,
meta_data
[
128
+:
16
],
meta_data
[
96
+:
32
]
}
;
//output_word <= {16'h0, meta_data[128 +: 16], meta_data[96 +: 32]}; // prints out the pointer and length
output_word
<=
{
32'h0
,
malloc_stat_data
}
;
first_value_word
<=
1
;
...
...
@@ -375,7 +378,8 @@ always @(posedge clk) begin
ST_NO_HEADER:
begin
if
(
output_ready
==
1
)
begin
output_valid
<=
sendAnswerReg
;
output_word
<=
{
16'h0
,
meta_data
[
128
+:
16
],
meta_data
[
96
+:
32
]
}
;
//output_word <= {16'h0, meta_data[128 +: 16], meta_data[96 +: 32]}; // prints out the pointer and length
output_word
<=
{
32'h0
,
malloc_stat_data
}
;
first_value_word
<=
1
;
...
...
hw/src/nukv/nukv_malloc_v2.v
View file @
986a98dd
...
...
@@ -94,7 +94,9 @@ module nukv_Malloc #(
input
wire
b_wrcmd_ready
,
output
reg
error_memory
,
output
reg
[
7
:
0
]
error_state
output
reg
[
7
:
0
]
error_state
,
output
reg
[
31
:
0
]
stat_size
// memory interface...
...
...
@@ -1050,6 +1052,30 @@ module nukv_Malloc #(
end
end
reg
[
47
:
0
]
stat_allocated
;
reg
[
47
:
0
]
stat_freed
;
reg
[
31
:
0
]
stat_compute
;
always
@
(
posedge
clk
)
begin
if
(
rst
||
(
free_valid
==
1
&&
free_ready
==
1
&&
free_wipe
==
1
))
begin
stat_allocated
<=
0
;
stat_freed
<=
0
;
end
else
begin
if
(
free_ready
==
1
&&
free_valid
==
1
)
begin
stat_freed
<=
stat_freed
+
free_size
;
end
if
(
req_valid
==
1
&&
req_ready
==
1
)
begin
stat_allocated
<=
stat_allocated
+
req_data
;
end
stat_compute
<=
stat_allocated
-
stat_freed
;
end
stat_size
<=
stat_compute
;
end
endmodule
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment