Skip to content

Commit f5a6ab7

Browse files
authored
Some improvements (#292)
* feat: some improvement * feat: some improvement
1 parent 8db5748 commit f5a6ab7

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/src/pipeline/memory/AddrTransStage.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ class AddrTransStage
4444
AddrTransNdPort.default,
4545
Some(new AddrTransPeerPort)
4646
) {
47-
val selectedIn = io.in.bits
48-
val selectedInVirtAddr = Cat(selectedIn.memRequest.addr(wordLength - 1, 2), 0.U(2.W))
49-
val peer = io.peer.get
50-
val resultOut = WireDefault(0.U.asTypeOf(Valid(new MemReqNdPort)))
51-
val out = resultOut.bits
52-
resultOutReg := resultOut
47+
val selectedIn = io.in.bits
48+
val peer = io.peer.get
49+
val out = if (isNoPrivilege) io.out.bits else resultOutReg.bits
50+
if (isNoPrivilege) {
51+
io.in.ready := io.out.ready
52+
io.out.valid := io.in.valid
53+
}
5354

5455
val tlbBlockingReg = RegInit(false.B)
5556
tlbBlockingReg := tlbBlockingReg

utils/firtool

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
ARGS='-O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --disable-all-randomization --lowering-options disallowLocalVariables'
3+
ARGS='-O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --lowering-options disallowLocalVariables'
44

55
# Workaround
66
for arg do
@@ -12,7 +12,7 @@ for arg do
1212
done
1313

1414
if [[ "$OSTYPE" == "darwin"* ]]; then
15-
firtool_darwin -O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --disable-all-randomization --lowering-options disallowLocalVariables "$@"
15+
firtool_darwin -O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --lowering-options disallowLocalVariables "$@"
1616
else
17-
firtool_ubuntu2004 -O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --disable-all-randomization --lowering-options disallowLocalVariables "$@"
17+
firtool_ubuntu2004 -O=release --dedup --disable-annotation-unknown --add-vivado-ram-address-conflict-synthesis-bug-workaround --lowering-options disallowLocalVariables "$@"
1818
fi

0 commit comments

Comments
 (0)