Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MINOTAuR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MINOTAuR
MINOTAuR
Commits
38d335fc
Commit
38d335fc
authored
3 years ago
by
Alban Gruin
Browse files
Options
Downloads
Patches
Plain Diff
verifier: lock I$ on D$ writes
Signed-off-by:
Alban Gruin
<
alban.gruin@irit.fr
>
parent
3c30b43e
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/ariane.sv
+7
-1
7 additions, 1 deletion
src/ariane.sv
src/ex_stage.sv
+2
-0
2 additions, 0 deletions
src/ex_stage.sv
src/load_store_unit.sv
+3
-2
3 additions, 2 deletions
src/load_store_unit.sv
src/verifier.sv
+4
-1
4 additions, 1 deletion
src/verifier.sv
with
16 additions
and
4 deletions
src/ariane.sv
+
7
−
1
View file @
38d335fc
...
...
@@ -103,6 +103,8 @@ module ariane import ariane_pkg::*; #(
logic
has_mem_access_is_verif
;
logic
has_ctrl_flow_is_icache
;
logic
store_buffer_empty_verif
;
// --------------
// ISSUE <-> EX
// --------------
...
...
@@ -445,6 +447,7 @@ module ariane import ariane_pkg::*; #(
.
lsu_commit_ready_o
(
lsu_commit_ready_ex_commit
),
// to commit
.
commit_tran_id_i
(
lsu_commit_trans_id
),
// from commit
.
no_st_pending_o
(
no_st_pending_ex
),
.
store_buffer_empty_o
(
store_buffer_empty_verif
),
// FPU
.
fpu_ready_o
(
fpu_ready_ex_id
),
.
fpu_valid_i
(
fpu_valid_id_ex
),
...
...
@@ -664,6 +667,9 @@ module ariane import ariane_pkg::*; #(
// I$
.
icache_miss_i
(
icache_miss_cache_perf
),
// D$
.
dcache_wbuffer_empty_i
(
dcache_commit_wbuffer_empty
),
// IF
.
if_has_mem_access_i
(
has_mem_access_if_verif
),
.
if_has_cf_i
(
has_ctrl_flow_if_icache
),
...
...
@@ -677,7 +683,7 @@ module ariane import ariane_pkg::*; #(
.
is_has_cf_i
(
has_ctrl_flow_is_icache
),
// LSU
.
no_st_pending_commit_i
(
no_st_pending_ex
),
.
no_st_pending_commit_i
(
store_buffer_empty_verif
),
// CO
.
commit_instr_i
(
commit_instr_id_commit
),
...
...
This diff is collapsed.
Click to expand it.
src/ex_stage.sv
+
2
−
0
View file @
38d335fc
...
...
@@ -71,6 +71,7 @@ module ex_stage import ariane_pkg::*; #(
output
logic
lsu_commit_ready_o
,
// commit queue is ready to accept another commit request
input
logic
[
TRANS_ID_BITS
-
1
:
0
]
commit_tran_id_i
,
output
logic
no_st_pending_o
,
output
logic
store_buffer_empty_o
,
input
logic
amo_valid_commit_i
,
// FPU
output
logic
fpu_ready_o
,
// FU is ready
...
...
@@ -277,6 +278,7 @@ module ex_stage import ariane_pkg::*; #(
.
rst_ni
,
.
flush_i
,
.
no_st_pending_o
,
.
store_buffer_empty_o
,
.
fu_data_i
(
lsu_data
),
.
lsu_ready_o
,
.
lsu_valid_i
,
...
...
This diff is collapsed.
Click to expand it.
src/load_store_unit.sv
+
3
−
2
View file @
38d335fc
...
...
@@ -21,6 +21,7 @@ module load_store_unit import ariane_pkg::*; #(
input
logic
rst_ni
,
input
logic
flush_i
,
output
logic
no_st_pending_o
,
output
logic
store_buffer_empty_o
,
input
logic
amo_valid_commit_i
,
input
fu_data_t
fu_data_i
,
...
...
@@ -196,9 +197,9 @@ module load_store_unit import ariane_pkg::*; #(
end
endgenerate
logic
store_buffer_empty
;
assign
store_buffer_empty_o
=
store_buffer_empty
;
// ------------------
// Store Unit
// ------------------
...
...
This diff is collapsed.
Click to expand it.
src/verifier.sv
+
4
−
1
View file @
38d335fc
...
...
@@ -9,6 +9,9 @@ module verifier #(
// I$
input
logic
icache_miss_i
,
// D$
input
logic
dcache_wbuffer_empty_i
,
// Frontend
input
logic
if_has_mem_access_i
,
input
logic
if_has_cf_i
,
...
...
@@ -35,7 +38,7 @@ module verifier #(
// Bus accesses (I$ misses and memory instructions in the pipeline)
logic
has_mem_access
;
assign
has_mem_access
=
if_has_mem_access_i
|
id_has_mem_access_i
|
is_has_mem_access_i
|
(
~
no_st_pending_commit_i
)
;
assign
has_mem_access
=
if_has_mem_access_i
|
id_has_mem_access_i
|
is_has_mem_access_i
|
~
no_st_pending_commit_i
|
~
dcache_wbuffer_empty_i
;
// assign should_lock_icache_o = has_mem_access & icache_miss_i;
assign
should_lock_icache_o
=
has_mem_access
|
if_has_cf_i
|
id_has_cf_i
|
is_has_cf_i
;
...
...
This diff is collapsed.
Click to expand it.
Ghost User
@ghost
mentioned in commit
2247eb0c
·
8 months ago
mentioned in commit
2247eb0c
mentioned in commit 2247eb0c18bd13c4eca99e049280ad2750d5601b
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment