Skip to content
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

Diplomatic tilelink "v1" parameter fixes #2428

Merged
merged 3 commits into from
Apr 23, 2020
Merged

Diplomatic tilelink "v1" parameter fixes #2428

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ab8246
tilelink: TLSlaveParameters.v1copy needs to pass name, not setName
hcook Apr 22, 2020
10f49a1
tilelink: turn TLSlaveToMasterTransferSizes.probe rendering to P
hcook Apr 22, 2020
30963e5
tilelink: turn TLSlaveParameters.setName into an Option[String]
hcook Apr 22, 2020
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
10 changes: 5 additions & 5 deletions src/main/scala/tilelink/Parameters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ case class TLSlaveToMasterTransferSizes(
override def toString = {
def str(x: TransferSizes, flag: String) = if (x.none) "" else flag
def flags = Vector(
str(probe, "T"),
str(probe, "P"),
str(arithmetic, "A"),
str(logical, "L"),
str(get, "G"),
Expand Down Expand Up @@ -134,7 +134,7 @@ trait TLCommonTransferSizes {
class TLSlaveParameters private(
val nodePath: Seq[BaseNode],
val resources: Seq[Resource],
setName: String,
setName: Option[String],
val address: Seq[AddressSet],
val regionType: RegionType.T,
val executable: Boolean,
Expand Down Expand Up @@ -195,7 +195,7 @@ class TLSlaveParameters private(
require (regionType <= RegionType.UNCACHED || supportsAcquireB) // tracked, cached -> acquire
require (regionType != RegionType.UNCACHED || supportsGet) // uncached -> supportsGet

val name = if (setName != "") setName else nodePath.lastOption.map(_.lazyModule.name).getOrElse("disconnected")
val name = setName.orElse(nodePath.lastOption.map(_.lazyModule.name)).getOrElse("disconnected")
val maxTransfer = List( // Largest supported transfer of all types
supportsAcquireT.max,
supportsAcquireB.max,
Expand Down Expand Up @@ -261,7 +261,7 @@ class TLSlaveParameters private(
fifoId: Option[Int] = fifoId) =
{
new TLSlaveParameters(
setName = name,
setName = setName,
address = address,
resources = resources,
regionType = regionType,
Expand Down Expand Up @@ -345,7 +345,7 @@ object TLSlaveParameters {
fifoId: Option[Int] = None) =
{
new TLSlaveParameters(
setName = "",
setName = None,
address = address,
resources = resources,
regionType = regionType,
Expand Down