Skip to content

fix: ICache uses parameters from DCache #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rewired-gh merged 1 commit into from
Jul 31, 2023
Merged

fix: ICache uses parameters from DCache #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/src/memory/ICache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ class ICache(

axiMaster.io.read.req.isValid := true.B
axiMaster.io.read.req.addr := Cat(
lastReg.memAddr(Width.Mem._addr - 1, Param.Width.DCache._byteOffset),
0.U(Param.Width.DCache.byteOffset)
lastReg.memAddr(Width.Mem._addr - 1, Param.Width.ICache._byteOffset),
0.U(Param.Width.ICache.byteOffset)
)

when(axiMaster.io.read.req.isReady) {
Expand Down
8 changes: 5 additions & 3 deletions src/src/spec/Param.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ object Param {
}

object DCache {
val _addr = 8 // TODO: Choose an optimal value (small value is suitible for difftest)
val _addr =
if (isReleasePackage) 8 else 10 // TODO: Choose an optimal value (small value is suitible for difftest)
val _byteOffset = log2Ceil(Count.DCache.dataPerLine) + log2Ceil(wordLength / byteLength)
val _dataLine = Count.DCache.dataPerLine * spec.Width.Mem._data
val _tag = spec.Width.Mem._addr - _addr - _byteOffset
Expand All @@ -103,7 +104,8 @@ object Param {
}

object ICache {
val _addr = 8 // TODO: Choose an optimal value (small value is suitible for difftest)
val _addr =
if (isReleasePackage) 8 else 10 // TODO: Choose an optimal value (small value is suitible for difftest)
val _instOffset = log2Ceil(wordLength / byteLength)
val _fetchOffset = log2Ceil(fetchInstMaxNum) + log2Ceil(wordLength / byteLength)
val _byteOffset = log2Ceil(Count.ICache.dataPerLine) + log2Ceil(wordLength / byteLength)
Expand All @@ -125,7 +127,7 @@ object Param {

object DCache {
val setLen = 2 // Also the number of RAMs for data; TODO: Choose an optimal value
val dataPerLine = 16 // TODO: One data line is 64 bytes
val dataPerLine = if (isReleasePackage) 8 else 16
val sizePerRam = math.pow(2, Width.DCache._addr).toInt
}

Expand Down